Commit 2ac3c583 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

CI: improvements


  -- remove extra build options (not necessary anymore)
  -- fix in reporting
Signed-off-by: Raphael Defosseux's avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 89344c5d
...@@ -56,7 +56,6 @@ ARCHIVES_LOC=enb_usrp ...@@ -56,7 +56,6 @@ ARCHIVES_LOC=enb_usrp
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=4 NB_PATTERN_FILES=4
BUILD_OPTIONS="--eNB -w USRP" BUILD_OPTIONS="--eNB -w USRP"
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
KEEP_VM_ALIVE=0 KEEP_VM_ALIVE=0
while [[ $# -gt 0 ]] while [[ $# -gt 0 ]]
...@@ -84,7 +83,6 @@ case $key in ...@@ -84,7 +83,6 @@ case $key in
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=4 NB_PATTERN_FILES=4
BUILD_OPTIONS="--eNB -w USRP" BUILD_OPTIONS="--eNB -w USRP"
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
shift shift
;; ;;
-v2) -v2)
...@@ -93,7 +91,6 @@ case $key in ...@@ -93,7 +91,6 @@ case $key in
LOG_PATTERN=basic_simulator LOG_PATTERN=basic_simulator
NB_PATTERN_FILES=2 NB_PATTERN_FILES=2
BUILD_OPTIONS="--basic-simulator" BUILD_OPTIONS="--basic-simulator"
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
shift shift
;; ;;
-v3) -v3)
...@@ -102,7 +99,6 @@ case $key in ...@@ -102,7 +99,6 @@ case $key in
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=3 NB_PATTERN_FILES=3
BUILD_OPTIONS="--phy_simulators" BUILD_OPTIONS="--phy_simulators"
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
shift shift
;; ;;
-v4) -v4)
...@@ -111,7 +107,6 @@ case $key in ...@@ -111,7 +107,6 @@ case $key in
LOG_PATTERN=cppcheck.xml LOG_PATTERN=cppcheck.xml
NB_PATTERN_FILES=1 NB_PATTERN_FILES=1
BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2" BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2"
BUILD_EXTRA_OPTIONS=""
shift shift
;; ;;
--variant) --variant)
...@@ -123,7 +118,6 @@ case $key in ...@@ -123,7 +118,6 @@ case $key in
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=4 NB_PATTERN_FILES=4
BUILD_OPTIONS="--eNB -w USRP" BUILD_OPTIONS="--eNB -w USRP"
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
;; ;;
basic-sim) basic-sim)
VM_NAME=ci-basic-sim VM_NAME=ci-basic-sim
...@@ -131,7 +125,6 @@ case $key in ...@@ -131,7 +125,6 @@ case $key in
LOG_PATTERN=basic_simulator LOG_PATTERN=basic_simulator
NB_PATTERN_FILES=2 NB_PATTERN_FILES=2
BUILD_OPTIONS="--basic-simulator" BUILD_OPTIONS="--basic-simulator"
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
;; ;;
phy-sim) phy-sim)
VM_NAME=ci-phy-sim VM_NAME=ci-phy-sim
...@@ -139,7 +132,6 @@ case $key in ...@@ -139,7 +132,6 @@ case $key in
LOG_PATTERN=.Rel14.txt LOG_PATTERN=.Rel14.txt
NB_PATTERN_FILES=3 NB_PATTERN_FILES=3
BUILD_OPTIONS="--phy_simulators" BUILD_OPTIONS="--phy_simulators"
BUILD_EXTRA_OPTIONS="--cflags_processor \"-mssse3 -msse4.1 -mavx2\""
;; ;;
cppcheck) cppcheck)
VM_NAME=ci-cppcheck VM_NAME=ci-cppcheck
...@@ -147,7 +139,6 @@ case $key in ...@@ -147,7 +139,6 @@ case $key in
LOG_PATTERN=cppcheck.xml LOG_PATTERN=cppcheck.xml
NB_PATTERN_FILES=1 NB_PATTERN_FILES=1
BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2" BUILD_OPTIONS="--enable=warning --force --xml --xml-version=2"
BUILD_EXTRA_OPTIONS=""
;; ;;
*) *)
echo "" echo ""
...@@ -187,7 +178,6 @@ echo "VM_CMD_FILE = $VM_CMDS" ...@@ -187,7 +178,6 @@ echo "VM_CMD_FILE = $VM_CMDS"
echo "JENKINS_WKSP = $JENKINS_WKSP" echo "JENKINS_WKSP = $JENKINS_WKSP"
echo "ARCHIVES_LOC = $ARCHIVES_LOC" echo "ARCHIVES_LOC = $ARCHIVES_LOC"
echo "BUILD_OPTIONS = $BUILD_OPTIONS" echo "BUILD_OPTIONS = $BUILD_OPTIONS"
echo "BUILD_EXTRA_OPTIONS = $BUILD_EXTRA_OPTIONS"
echo "############################################################" echo "############################################################"
echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base" echo "Creating VM ($VM_NAME) on Ubuntu Cloud Image base"
...@@ -235,7 +225,7 @@ else ...@@ -235,7 +225,7 @@ else
echo "mkdir log" >> $VM_CMDS echo "mkdir log" >> $VM_CMDS
echo "cp /home/ubuntu/zip-install.txt log" >> $VM_CMDS echo "cp /home/ubuntu/zip-install.txt log" >> $VM_CMDS
echo "echo \"./build_oai -I $BUILD_OPTIONS \"" >> $VM_CMDS echo "echo \"./build_oai -I $BUILD_OPTIONS \"" >> $VM_CMDS
echo "./build_oai -I $BUILD_OPTIONS $BUILD_EXTRA_OPTIONS > log/install-build.txt 2>&1" >> $VM_CMDS echo "./build_oai -I $BUILD_OPTIONS > log/install-build.txt 2>&1" >> $VM_CMDS
fi fi
ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS
......
...@@ -407,7 +407,7 @@ echo " </img>" >> ./build_results.html ...@@ -407,7 +407,7 @@ echo " </img>" >> ./build_results.html
echo " </a>" >> ./build_results.html echo " </a>" >> ./build_results.html
echo " </td>" >> ./build_results.html echo " </td>" >> ./build_results.html
echo " <td style=\"border-collapse: collapse; border: none; vertical-align: center;\">" >> ./build_results.html echo " <td style=\"border-collapse: collapse; border: none; vertical-align: center;\">" >> ./build_results.html
echo " <b><font size = \"6\">Job Summary -- Job: eNb-CI -- Build-ID: 23</font></b>" >> ./build_results.html echo " <b><font size = \"6\">Job Summary -- Job: $JOB_NAME -- Build-ID: $BUILD_ID</font></b>" >> ./build_results.html
echo " </td>" >> ./build_results.html echo " </td>" >> ./build_results.html
echo " </tr>" >> ./build_results.html echo " </tr>" >> ./build_results.html
echo " </table>" >> ./build_results.html echo " </table>" >> ./build_results.html
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment