X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c57a40adaff61d4e518e00b63bca43b880b7db0..e84659ef22bae50c28bce4163d837e819a6a7fc5:/tools/jenkins/project_description.sh?ds=sidebyside
diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh
index 2a7ab8b076..3570212509 100755
--- a/tools/jenkins/project_description.sh
+++ b/tools/jenkins/project_description.sh
@@ -154,14 +154,14 @@ do
color1="&color=green"
fi
rm status
- statusmc=""
+ statusmc="
"
wget --quiet https://ci.inria.fr/simgrid/buildStatus/text?job=SimGrid%2Fbuild_mode%3DModelChecker%2Cnode%3D${node} -O status >/dev/null 2>&1
status=$(cat status)
if [ $status ]; then
if [ $status == "Success" ]; then
color2="&color=green"
fi
- statusmc="
"
+ statusmc="![](\"https://ci.inria.fr/simgrid/job/SimGrid/build_mode=ModelChecker,node=${node}/badge/icon?style=ball-24x24${color2}\"/)
"
fi
rm status
echo " | $node | $os | $compiler | $boost | $java | $cmake | $ns3 | $py |  | ${statusmc} |
"
@@ -172,18 +172,20 @@ 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 [ $id == 0 ]; then
+
+ if [ ${OS[$id]} == "linux" ]; then
node="travis-linux (log)"
- os="Ubuntu 16.04 xenial"
- elif [ $id == 1 ]; then
+ os="Ubuntu 18.04 bionic"
+ elif [ ${OS[$id]} == "osx" ]; then
node="travis-mac (log)"
os="Mac OS X Mojave (10.14) "
- elif [ $id == 2 ]; then
+ elif [ ${OS[$id]} == "windows" ]; then
node="travis-windows (log)"
os="Windows 10 v17134"
fi
@@ -193,8 +195,33 @@ do
cmake=$(get_cmake)
ns3=$(get_ns3)
py=$(get_python)
- echo " | $node | $os | $compiler | $boost | $java | $cmake | $ns3 | $py | | |
"
+ 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
+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)
+ns3=$(get_ns3)
+py=$(get_python)
+success=$(grep -m 1 "Build success" ./consoleText)
+ball="red.png"
+if [ -n "$success" ]; then
+ ball="blue.png"
+fi
+echo " | $node | $os | $compiler | $boost | $java | $cmake | $ns3 | $py | | |
"
+rm consoleText
+
echo ""