From d88f671f4ed1bffbc94570924c54a65e1575d025 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Fri, 12 Aug 2016 14:23:31 +0200 Subject: [PATCH 1/5] added new machines to Gitlab CI --- cmake_targets/autotests/test_case_list.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml index e50c651fa3..000297bd84 100644 --- a/cmake_targets/autotests/test_case_list.xml +++ b/cmake_targets/autotests/test_case_list.xml @@ -1,6 +1,6 @@ -mozart tique stevens amerique +mozart hutch starsky stevens amerique calisson nano /mnt/sradio/TEST_RESULTS/ https://gitlab.eurecom.fr/oai/openairinterface5g.git https://gitlab.eurecom.fr/oai/openair-cn.git @@ -12,7 +12,7 @@ 36000 010141 0102+ 010304 010305 0104+ 015502 015505 015506 015507 015508 015509 015510 015511 015514 015517 015602 015605 015702 015705 015802 015805 015808 015811 016102 016105 016502 016505 017002 017005 017502 017505 018002 018005 018502 018505 025502 025505 025508 025511 3 - mozart tique stevens amerique + mozart hutch starsky stevens amerique calisson nano compilation Build oaisim.Rel8 From 47e0589aafc074e43c64dab9aa664e6da3cee18e Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Sun, 14 Aug 2016 11:33:10 +0200 Subject: [PATCH 2/5] Gitlab CI: minor fix to install Git --- cmake_targets/autotests/run_exec_lte-softmodem_tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py index b25bc08427..0bc4480890 100755 --- a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py +++ b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py @@ -1430,6 +1430,7 @@ for oai in oai_list: #cmd = cmd + 'rm -fR ' + logdir + '\n' #cmd = cmd + 'mkdir -p ' + logdir + '\n' cmd = cmd + 'cd '+ logdir + '\n' + cmd = cmd + 'sudo apt-get install git \n' cmd = cmd + 'git config --global http.sslVerify false \n' cmd = cmd + 'git clone '+ GitOAI5GRepo +' \n' cmd = cmd + 'git clone '+ GitOpenaircnRepo + ' \n' From d2d8290752e8d5c449725f7848c0ee29afdc3ba6 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Sun, 14 Aug 2016 12:03:00 +0200 Subject: [PATCH 3/5] Gitlab CI: command to retry git clone in case of network failure --- cmake_targets/autotests/tools/git-retry.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 cmake_targets/autotests/tools/git-retry.sh diff --git a/cmake_targets/autotests/tools/git-retry.sh b/cmake_targets/autotests/tools/git-retry.sh new file mode 100755 index 0000000000..0645646b74 --- /dev/null +++ b/cmake_targets/autotests/tools/git-retry.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +#Simple script to retry git clone in case of failure + +REALGIT=/usr/bin/git + +RETRIES=10 +DELAY=10 +COUNT=1 +while [ $COUNT -lt $RETRIES ]; do + $REALGIT $* + if [ $? -eq 0 ]; then + RETRIES=0 + break + fi + let COUNT=$COUNT+1 + sleep $DELAY +done From cde45da309f402e5f12ddc647c200ad70c9c189d Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Sun, 14 Aug 2016 12:37:04 +0200 Subject: [PATCH 4/5] minor fix for git-retry logging --- cmake_targets/autotests/tools/git-retry.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake_targets/autotests/tools/git-retry.sh b/cmake_targets/autotests/tools/git-retry.sh index 0645646b74..c1cc93ba42 100755 --- a/cmake_targets/autotests/tools/git-retry.sh +++ b/cmake_targets/autotests/tools/git-retry.sh @@ -8,7 +8,7 @@ RETRIES=10 DELAY=10 COUNT=1 while [ $COUNT -lt $RETRIES ]; do - $REALGIT $* + $REALGIT $* >> git-clone-log.txt 2>&1 if [ $? -eq 0 ]; then RETRIES=0 break From 9f819158e6a9260600539c74e871d0d3ad94c768 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Sun, 14 Aug 2016 12:38:54 +0200 Subject: [PATCH 5/5] Gitlab CI: git retry when cloning fails --- .../autotests/run_exec_lte-softmodem_tests.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py index 0bc4480890..10f02ecfb8 100755 --- a/cmake_targets/autotests/run_exec_lte-softmodem_tests.py +++ b/cmake_targets/autotests/run_exec_lte-softmodem_tests.py @@ -1426,14 +1426,26 @@ for oai in oai_list: setuplogfile = logdir + '/setup_log_' + MachineList[index] + '_.txt' setup_script = locallogdir + '/setup_script_' + MachineList[index] + '_.txt' + + #Sometimes git fails so the script below retries in that case + localfile = os.path.expandvars('$OPENAIR_DIR/cmake_targets/autotests/tools/git-retry.sh') + remotefile = logdir + '/git-retry.sh' + paramList=[] + port=22 + paramList.append ( {"operation":'put', "localfile":localfile, "remotefile":remotefile} ) + sftp_log = os.path.expandvars(locallogdir + '/sftp_module.log') + sftp_module (user, pw, MachineList[index], port, paramList, sftp_log) + + cmd = ' ( \n' #cmd = cmd + 'rm -fR ' + logdir + '\n' #cmd = cmd + 'mkdir -p ' + logdir + '\n' cmd = cmd + 'cd '+ logdir + '\n' - cmd = cmd + 'sudo apt-get install git \n' + cmd = cmd + 'sudo apt-get install -y git \n' cmd = cmd + 'git config --global http.sslVerify false \n' - cmd = cmd + 'git clone '+ GitOAI5GRepo +' \n' - cmd = cmd + 'git clone '+ GitOpenaircnRepo + ' \n' + cmd = cmd + 'chmod 700 ' + logdir + '/git-retry.sh \n' + cmd = cmd + logdir + '/git-retry.sh clone '+ GitOAI5GRepo +' \n' + cmd = cmd + logdir + '/git-retry.sh clone '+ GitOpenaircnRepo + ' \n' cmd = cmd + 'cd ' + logdirOAI5GRepo + '\n' cmd = cmd + 'git checkout ' + GitOAI5GRepoBranch + '\n' #cmd = cmd + 'git checkout ' + GitOAI5GHeadVersion + '\n'