From faac2dce2645de4d719ca83941aeaec18058deac Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Sat, 7 Jul 2018 19:34:06 +0200 Subject: [PATCH 1/1] remove references to SimGrid-Multi jenkins job, now just SimGrid --- doc/doxygen/inside_tests.doc | 4 ++-- doc/doxygen/install.doc | 2 +- tools/jenkins/build.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/doxygen/inside_tests.doc b/doc/doxygen/inside_tests.doc index 7845eb2a75..8188d3b286 100644 --- a/doc/doxygen/inside_tests.doc +++ b/doc/doxygen/inside_tests.doc @@ -257,7 +257,7 @@ refer to the CI documentation. The result can be seen here: https://ci.inria.fr/simgrid/ We have 2 interesting projects on Jenkins: -\li SimGrid-Multi +\li SimGrid is the main project, running the tests that we spoke about.\n It is configured (on Jenkins) to run the script tools/jenkins/build.sh \li SimGrid-DynamicAnalysis @@ -269,7 +269,7 @@ We have 2 interesting projects on Jenkins: In each case, SimGrid gets built in /builds/workspace/$PROJECT/build_mode/$CONFIG/label/$SERVER/build -with $PROJECT being for instance "SimGrid-Multi", $CONFIG "DEBUG" or +with $PROJECT being for instance "SimGrid", $CONFIG "DEBUG" or "ModelChecker" and $SERVER for instance "simgrid-fedora20-64-clang". If some configurations are known to fail on some systems (such as diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc index 88d880eaec..8b474c7388 100644 --- a/doc/doxygen/install.doc +++ b/doc/doxygen/install.doc @@ -37,7 +37,7 @@ For Windows, head to [AppVeyor](https://ci.appveyor.com/project/simgrid/simgrid) Click on the artefact link on the right, and grab your file. If the latest build failed, there will be no artefact. Then you will need to first click on "History" on the top and search for the last successful build. -For non-Windows systems (Linux, Mac or FreeBSD), head to [Jenkins](https://ci.inria.fr/simgrid/job/SimGrid-Multi). +For non-Windows systems (Linux, Mac or FreeBSD), head to [Jenkins](https://ci.inria.fr/simgrid/job/SimGrid). In the build history, pick the last green (or at least yellow) build that is not blinking (i.e., not currently under build). In the list, pick a system that is close to yours, and click on the ball in the Debug row. The build artefact will appear on the top of the resulting page. diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index 264f755de6..d4a00073a7 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -2,7 +2,7 @@ # This script is used by various build projects on Jenkins -# See https://ci.inria.fr/simgrid/job/SimGrid-Multi/configure +# See https://ci.inria.fr/simgrid/job/SimGrid/configure # See https://ci.inria.fr/simgrid/job/Simgrid-Windows/configure set -e @@ -13,7 +13,7 @@ export LC_ALL=C echo "XXXX Cleanup previous attempts. Remaining content of /tmp:" rm -rf /tmp/simgrid-java* rm -rf /tmp/jvm-* -find /builds/workspace/SimGrid-Multi/ -name "hs_err_pid*.log" | xargs rm -f +find /builds/workspace/SimGrid/ -name "hs_err_pid*.log" | xargs rm -f ls /tmp df -h echo "XXXX Let's go" -- 2.20.1