X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50102ec1c30562e20d450afa7015374387bf1904..bd8d9efcd90129b63d20efdb662d6f751970acab:/tools/jenkins/project_description.sh?ds=sidebyside diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh index 1be78989ba..cd019ca223 100755 --- a/tools/jenkins/project_description.sh +++ b/tools/jenkins/project_description.sh @@ -133,7 +133,10 @@ function sortTable(n, type) { for node in "${nodes[@]}" do - wget --quiet ${BUILD_URL}/build_mode=Debug,node=${node}/consoleText >/dev/null 2>&1 + wget --quiet --output-document=consoleText \ + ${BUILD_URL}/build_mode=Debug,node=${node}/consoleText \ + ${BUILD_URL}/build_mode=ModelChecker,node=${node}/consoleText \ + >/dev/null 2>&1 if [ ! -f consoleText ]; then echo "file not existing for node ${node}" exit 1 @@ -170,41 +173,6 @@ do done -#Travis - get ID of the last jobs with the API -BUILD_NUM=$(curl -s 'https://api.travis-ci.org/repos/simgrid/simgrid/builds?limit=1' | grep -o '^\[{"id":[0-9]*,' | grep -o '[0-9]' | tr -d '\n') -BUILDS=($(curl -s https://api.travis-ci.org/repos/simgrid/simgrid/builds/"${BUILD_NUM}" | grep -o '{"id":[0-9]*,' | grep -o '[0-9]*'| tail -n 3)) -OS=($(curl -s https://api.travis-ci.org/repos/simgrid/simgrid/builds/"${BUILD_NUM}" | grep -o '"os":"[a-z]*",' | sed 's/"os":"\([a-z]*\)",/\1/g'| tail -n 3)) - -for id in "${!BUILDS[@]}" -do - wget --quiet https://api.travis-ci.org/v3/job/"${BUILDS[$id]}"/log.txt -O ./consoleText >/dev/null 2>&1 - sed -i -e "s/\r//g" ./consoleText - - if [ "${OS[$id]}" == "linux" ]; then - node="travis-linux (log)" - os="Ubuntu 18.04 bionic" - elif [ "${OS[$id]}" == "osx" ]; then - node="travis-mac (log)" - os="Mac OS X Catalina (10.15) " - elif [ "${OS[$id]}" == "windows" ]; then - node="travis-windows (log)" - os="Windows Server 1809" - fi - boost=$(get_boost) - compiler=$(get_compiler) - java=$(get_java) - cmake=$(get_cmake) - ns3=$(get_ns3) - py=$(get_python) - success=$(grep -m 1 "Your build exited with 0" ./consoleText) - ball="red.png" - if [ -n "$success" ]; then - ball="blue.png" - fi - echo " $node$os$compiler$boost$java$cmake$ns3$py" - rm consoleText -done - #Appveyor - get ID of the last job with the API BUILD_ID=$(curl -s "https://ci.appveyor.com/api/projects/mquinson/simgrid" | grep -o '\[{"jobId":"[a-zA-Z0-9]*",' | sed "s/\[{\"jobId\":\"//" | sed "s/\",//") wget --quiet https://ci.appveyor.com/api/buildjobs/"$BUILD_ID"/log -O ./consoleText >/dev/null 2>&1