starpu: oops, uncomment lines [ci-skip]

[simgrid.git] / tools / jenkins / ci-starpu.sh

diff --git a/tools/jenkins/ci-starpu.sh b/tools/jenkins/ci-starpu.sh
index fc0ced6..73864b4 100755 (executable)
--- a/tools/jenkins/ci-starpu.sh
+++ b/tools/jenkins/ci-starpu.sh
@@ -1,27 +1,28 @@
 #!/usr/bin/env sh
-set -e
+
+# Test this script locally as follows (rerun `docker pull simgrid/unstable` to get a fresh version).
+# cd (simgrid)/tools/jenkins
+# docker run -it --rm --volume `pwd`:/source simgrid/unstable /source/ci-starpu.sh
+
+set -ex
 
 export SUDO=""
 
-# Update refs, just in case
+echo "XXXXXXXXXXXXXXXX Install APT dependencies"
 $SUDO apt-get update
+$SUDO apt-get -y install build-essential libboost-all-dev wget git xsltproc
 
-# Install basic tools
-$SUDO apt-get -y install build-essential
-$SUDO apt-get -y install libboost-all-dev
-$SUDO apt-get -y install wget
-$SUDO apt-get -y install git
-
-for i in master 1.3 ; do
+for i in master starpu-1.3 ; do
+  echo "XXXXXXXXXXXXXXXX Build and test StarPU $i"
   rm -rf starpu*
-  wget https://files.inria.fr/starpu/simgrid/starpu-simgrid-$i.tar.gz
-  md5sum starpu-simgrid-$i.tar.gz
-  tar xf starpu-simgrid-$i.tar.gz
+  wget https://files.inria.fr/starpu/testing/$i/starpu-nightly-latest.tar.gz
+  md5sum starpu-nightly-latest.tar.gz
+  tar xf starpu-nightly-latest.tar.gz
   cd starpu-1*
 
   # NOTE: Do *not* introduce parameters to "make it work" here.
   # Things should "just work" with default parameters!
-  # Users should not have to tinker to get starpu working on top of simgrid, that is precisely why we have this CI
+  # Users should not have to tinker to get starpu working on top of SimGrid, that is precisely why we have this CI
 
   if [ $i = master ]; then
     # On master, fail if we use deprecated functions, so that StarPU people know they have to stop using them, fix it, and thus make CI happy again
@@ -32,13 +33,13 @@ for i in master 1.3 ; do
     CXXFLAGS=""
   fi
   if ! ./configure CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
-                   --enable-simgrid --disable-shared --enable-mpi-check --disable-cuda \
+                   --enable-simgrid --disable-shared --enable-mpi --enable-mpi-check --disable-cuda \
                    --disable-build-doc --enable-quick-check
   then
     cat ./config.log
     false
   fi
-  make -j 2 V=1
+  make -j$(nproc) V=1
 
   for STARPU_SCHED in eager dmdas ; do
     export STARPU_SCHED