X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e529d79c390578099d7b5e3cbb779eb8dc4bed90..b4567f8f4bb0c2c3a888cf63256591aca12d2ac1:/tools/jenkins/project_description.sh
diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh
index 6d32a7b6d2..845abf1273 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(){
@@ -16,6 +21,24 @@ get_cmake(){
grep -m 1 "Cmake version" ./consoleText| sed "s/.*-- Cmake version \([a-zA-Z0-9\.]*\)/\1/g"
}
+get_ns3(){
+ 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 "â"
+ else
+ echo ""
+ fi
+}
+
if [ -f consoleText ]; then
rm consoleText
fi
@@ -27,13 +50,85 @@ 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
echo "
Description of the nodes - Automatically updated by project_description.sh script - Don't edit here
-
-
"
+
+
+
+
"
for node in "${nodes[@]}"
do
@@ -46,48 +141,40 @@ do
compiler=$(get_compiler)
java=$(get_java)
cmake=$(get_cmake)
+ ns3=$(get_ns3)
+ py=$(get_python)
os=$(grep -m 1 "OS Version" ./consoleText| sed "s/OS Version : \(.*\)/\1/g")
- echo " $node | $os | $compiler | $boost | $java | $cmake |
"
+ echo " $node | $os | $compiler | $boost | $java | $cmake | $ns3 | $py |
"
rm consoleText
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 2))
+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))
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 [ $id == 0 ]; then
- node="travis-linux"
- os="Ubuntu 14.04 (Trusty) 64 bits"
- else
- node="travis-mac"
- os="Mac OSX High Sierra (kernel: 17.4.0)"
+ node="travis-linux (log)"
+ os="Ubuntu 16.04 xenial"
+ elif [ $id == 1 ]; then
+ node="travis-mac (log)"
+ os="Mac OS X Mojave (10.14) "
+ elif [ $id == 2 ]; then
+ node="travis-windows (log)"
+ os="Windows 10 v17134"
fi
boost=$(get_boost)
compiler=$(get_compiler)
java=$(get_java)
cmake=$(get_cmake)
-
- echo " $node | $os | $compiler | $boost | $java | $cmake |
"
+ ns3=$(get_ns3)
+ py=$(get_python)
+ 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
-sed -i -e "s/\r//g" ./consoleText
-node="appveyor"
-os="Windows Server 2012 - VS2015 + mingw64 5.3.0"
-boost=$(get_boost)
-compiler=$(get_compiler)
-java=$(get_java)
-cmake=$(get_cmake)
-
-echo " $node | $os | $compiler | $boost | $java | $cmake |
"
-rm consoleText
-
echo "
"