From dbdc8849bcfe7b0e775b4a2a61b13a3c7ba7c581 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Mon, 13 Sep 2021 11:50:47 +0200
Subject: [PATCH] external CI scripts: cosmetics and uniformity

---
 tools/jenkins/ci-batsim.sh |  4 ++--
 tools/jenkins/ci-bigdft.sh |  9 ++++++++-
 tools/jenkins/ci-starpu.sh | 19 ++++++++++---------
 tools/jenkins/ci-wrench.sh | 33 +++++++++++++++------------------
 4 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/tools/jenkins/ci-batsim.sh b/tools/jenkins/ci-batsim.sh
index 7f532c587b..b2af1a000f 100755
--- a/tools/jenkins/ci-batsim.sh
+++ b/tools/jenkins/ci-batsim.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Test this script locally as follows (rerun `docker pull simgrid/unstable` to get a fresh version).
-# cd <simgrid/tools/jenkins
+# cd (simgrid)/tools/jenkins
 # docker run -it --rm --volume `pwd`:/source simgrid/unstable /source/ci-batsim.sh
 
 set -ex
@@ -35,7 +35,7 @@ echo "XXXXXXXXXXXXXXXX Install redox"
 $SUDO apt-get -y install libhiredis-dev libev-dev cmake #for redox
 git clone --depth=1 --branch=install-pkg-config-file https://github.com/mpoquet/redox.git
 cd redox 
-cmake -DCMAKE_INSTALL_PREFIX=/usr -Dstatic_lib=OFF . && make install
+cmake -DCMAKE_INSTALL_PREFIX=/usr -Dstatic_lib=OFF . && make -j$(nproc) install
 cp redox.pc /usr/lib/pkgconfig/
 cd ..
 
diff --git a/tools/jenkins/ci-bigdft.sh b/tools/jenkins/ci-bigdft.sh
index 95dd27ca3e..35f7ca0168 100755
--- a/tools/jenkins/ci-bigdft.sh
+++ b/tools/jenkins/ci-bigdft.sh
@@ -1,7 +1,13 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+# 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-bigdft.sh
+
 set -ex
 export OMP_NUM_THREADS=1
 
+echo "XXXXXXXXXXXXXXXX Install APT dependencies"
 SUDO="" # to ease the local testing
 $SUDO apt-get -y update
 $SUDO apt-get -y install git
@@ -10,6 +16,7 @@ $SUDO apt-get -y install python-is-python3
 $SUDO apt-get -y install python3-six
 $SUDO apt-get -y install jhbuild
 
+echo "XXXXXXXXXXXXXXXX build and test BigDFT (git version)"
 git clone --depth=1 https://gitlab.com/l_sim/bigdft-suite.git
 cd bigdft-suite
 
diff --git a/tools/jenkins/ci-starpu.sh b/tools/jenkins/ci-starpu.sh
index fc0ced67a7..22fc4265cd 100755
--- a/tools/jenkins/ci-starpu.sh
+++ b/tools/jenkins/ci-starpu.sh
@@ -1,18 +1,19 @@
 #!/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
-
-# 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
+$SUDO apt-get -y install build-essential libboost-all-dev wget git
 
 for i in master 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
@@ -38,7 +39,7 @@ for i in master 1.3 ; do
     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
diff --git a/tools/jenkins/ci-wrench.sh b/tools/jenkins/ci-wrench.sh
index 7fdb5b4f30..7d605b4e50 100755
--- a/tools/jenkins/ci-wrench.sh
+++ b/tools/jenkins/ci-wrench.sh
@@ -1,29 +1,26 @@
+#! /bin/sh
+
+# 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-wrench.sh
+
+set -ex
+
 export CXX="g++"
 export CC="gcc"
 export SUDO=""
 
-# Update refs, just in case
+echo "XXXXXXXXXXXXXXXX Install APT dependencies"
+
 $SUDO apt-get update
+$SUDO apt-get -y install cmake gcc g++ git
+$SUDO apt-get -y install unzip doxygen wget
+$SUDO apt-get -y install libboost-all-dev libpugixml-dev nlohmann-json3-dev libgtest-dev
 
-# Install basic tools
-$SUDO apt-get -y install cmake
-$SUDO apt-get -y install gcc
-$SUDO apt-get -y install g++
-$SUDO apt-get -y install unzip
-$SUDO apt-get -y install doxygen
-$SUDO apt-get -y install wget
-$SUDO apt-get -y install git
-$SUDO apt-get -y install libboost-all-dev
-$SUDO apt-get -y install libpugixml-dev
-$SUDO apt-get -y install nlohmann-json3-dev
-
-# install googletest
-wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz && tar xf release-1.8.0.tar.gz && cd googletest-release-1.8.0/googletest && cmake . && make && $SUDO make install && cd ../.. && rm -rf release-1.8.0.tar.gz googletest-release-1.8.0
-
-set -e
+echo "XXXXXXXXXXXXXXXX build and test wrench (git version)"
 # install WRENCH from their upstream git into the wrench.git directory
 rm -rf wrench.git && git clone --depth 1 --branch simgrid-external-project-ci https://github.com/wrench-project/wrench.git wrench.git
-(mkdir wrench.git/build && cd wrench.git/build && cmake -DSIMGRID_INSTALL_PATH=/usr/ .. && make unit_tests && ./unit_tests && cd ../.. && rm -rf wrench.git) || exit 1
+(mkdir wrench.git/build && cd wrench.git/build && cmake -DSIMGRID_INSTALL_PATH=/usr/ .. && make -j$(nproc) unit_tests && ./unit_tests && cd ../.. && rm -rf wrench.git) || exit 1
 
 
 
-- 
2.20.1