From 16314f041f7433f21d4efa116c8c75d826bdcfb0 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Wed, 29 Aug 2018 10:27:10 +0200
Subject: [PATCH] CI: fix EPC IP address retrieve and zip of test-files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/Jenkinsfile-gitlab | 2 +-
ci-scripts/runTestOnVM.sh | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index d4fe0d85552..d7279d7c46f 100644
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -319,7 +319,7 @@ pipeline {
always {
script {
dir ('archives') {
- sh "if [ -d */test ]; then zip -r -qq vm_tests_logs.zip */test ; fi"
+ sh "if [ -d basic_sim/test ] || [ -d phy_sim/test]; then zip -r -qq vm_tests_logs.zip */test ; fi"
}
if(fileExists('archives/vm_tests_logs.zip')) {
archiveArtifacts artifacts: 'archives/vm_tests_logs.zip'
diff --git a/ci-scripts/runTestOnVM.sh b/ci-scripts/runTestOnVM.sh
index a842f9932ef..9bb67803ab4 100755
--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
@@ -421,6 +421,10 @@ then
echo "############################################################"
ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < /opt/ltebox-archives/adapt_ue_sim.txt
fi
+
+ # for the moment, just a plain sleep
+ # TODO: more sophiscated way to detect EPC is started
+ sleep 5
fi
# HERE ADD any install actions for another EPC
@@ -469,6 +473,8 @@ then
ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS
rm $VM_CMDS
+ # for the moment, just a plain sleep
+ # TODO: more sophiscated way to detect eNB is started and that UE is connected
sleep 10
echo "ifconfig oip1 | egrep \"inet addr\" | sed -e 's#^.*inet addr:##' -e 's# P-t-P:.*\$##'" > $VM_CMDS
UE_IP_ADDR=`ssh -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR < $VM_CMDS`
--
GitLab