X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/314abba0374fcaab73ec8b6b25556474339c2928..bd8d9efcd90129b63d20efdb662d6f751970acab:/tools/jenkins/project_description.sh diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh index 04d327c18d..cd019ca223 100755 --- a/tools/jenkins/project_description.sh +++ b/tools/jenkins/project_description.sh @@ -1,7 +1,12 @@ -#!/bin/bash +#!/usr/bin/env bash get_boost(){ - grep -m 1 "Boost version:" ./consoleText | sed "s/.*-- Boost version: \([a-zA-Z0-9\.]*\)/\1/g" + BOOST=$(grep -m 1 "Boost version:" ./consoleText | sed "s/.*-- Boost version: \([a-zA-Z0-9\.]*\)/\1/g") + if [ -z "$BOOST" ] + then + BOOST=$(grep -m 1 "Found Boost:" ./consoleText | sed "s/.*-- Found Boost:.*found suitable version \"\([a-zA-Z0-9\.]*\)\",.*/\1/g") + fi + echo "$BOOST" } get_compiler(){ @@ -17,18 +22,19 @@ get_cmake(){ } get_ns3(){ - found=$(grep -c "NS-3 found" ./consoleText) - if [ $found != 0 ]; then - echo "â" - else - echo "" - fi + grep -m 1 "ns-3 found (v3.[0-9]*; incl:" ./consoleText | sed "s/.*-- ns-3 found .v\(3.[0-9]*\); incl:.*/\1/g" +# found=$(grep -c "ns-3 found" ./consoleText) +# if [ "$found" != 0 ]; then +# echo "â" +# else +# echo "" +# fi } get_python(){ found=$(grep -c "Compile Python bindings .....: ON" ./consoleText) - if [ $found != 0 ]; then - echo "â" + if [ "$found" != 0 ]; then + grep -m 1 "Found Python3" ./consoleText| sed "s/.*-- Found Python3.*found version \"\([a-zA-Z0-9\.]*\)\".*/\1/g" else echo "" fi @@ -39,13 +45,13 @@ if [ -f consoleText ]; then fi -if [ -z $BUILD_URL ]; then +if [ -z "$BUILD_URL" ]; then BUILD_URL="https://ci.inria.fr/simgrid/job/SimGrid/lastBuild" fi #get the list of nodes on jenkins wget --quiet ${BUILD_URL}/consoleText >/dev/null 2>&1 -nodes=($(grep -rR "Triggering SimGrid ? Debug," ./consoleText | sed "s/Triggering SimGrid ? Debug,\(.*\)/\1/g"| sort)) +nodes=($(sed -n 's/^Triggering SimGrid [^ ]* Debug,//p' ./consoleText| sort)) rm consoleText @@ -61,7 +67,7 @@ function compareVersion(v1, v2) { v1[i] = parseInt(v1[i], 10); v2[i] = parseInt(v2[i], 10); if (v1[i] > v2[i]) return 1; - if (v1[i] < v2[i]) return -1; + if (v1[i] < v2[i]) return -1; } return v1.length == v2.length ? 0: (v1.length < v2.length ? -1 : 1); } @@ -123,11 +129,14 @@ function sortTable(n, type) { } }
Name of the Builder | OS | Compiler | Boost | Java | Cmake | NS3 | Python | ||
Name of the Builder | OS | Compiler | Boost | Java | Cmake | ns-3 | Python | Debug | MC |
$node | $os | $compiler | $boost | $java | $cmake | $ns3 | $py | ||
$node | $os | $compiler | $boost | $java | $cmake | $ns3 | $py | ||
$node | $os | $compiler | $boost | $java | $cmake | $ns3 | $py | ${statusmc} | |
$node | $os | $compiler | $boost | $java | $cmake | $ns3 | $py | ||
$node | $os | $compiler | $boost | $java | $cmake | $ns3 | $py | ![]() |