From 00fb1e95acbe35d689ff602ac6749ba3ac2c3484 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Tue, 17 Dec 2019 17:54:25 +0100
Subject: [PATCH] CI: forcing the workspace removal on caracal
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/main.py | 18 +++++++++++++++++-
ci-scripts/xml_files/gnb_usrp_build.xml | 1 +
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index aaa7ede62a7..35574512f12 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -128,6 +128,7 @@ class SSHConnection():
self.Build_eNB_args = ''
self.backgroundBuild = False
self.backgroundBuildTestId = ['', '', '']
+ self.Build_eNB_forced_workspace_cleanup = False
self.Initialize_eNB_args = ''
self.air_interface = 'lte'
self.eNB_instance = ''
@@ -370,9 +371,16 @@ class SSHConnection():
self.air_interface = 'nr'
else:
self.air_interface = 'lte'
+ if self.Build_eNB_forced_workspace_cleanup:
+ self.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15)
+ result = re.search('([a-zA-Z0-9\:\-\.\/])+\.git', self.ranRepository)
+ if result is not None:
+ full_ran_repo_name = self.ranRepository
+ else:
+ full_ran_repo_name = self.ranRepository + '.git'
self.command('mkdir -p ' + lSourcePath, '\$', 5)
self.command('cd ' + lSourcePath, '\$', 5)
- self.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + self.ranRepository + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
+ self.command('if [ ! -e .git ]; then stdbuf -o0 git clone ' + full_ran_repo_name + ' .; else stdbuf -o0 git fetch --prune; fi', '\$', 600)
# Raphael: here add a check if git clone or git fetch went smoothly
self.command('git config user.email "jenkins@openairinterface.org"', '\$', 5)
self.command('git config user.name "OAI Jenkins"', '\$', 5)
@@ -4158,6 +4166,14 @@ def CheckClassValidity(action,id):
def GetParametersFromXML(action):
if action == 'Build_eNB':
SSH.Build_eNB_args = test.findtext('Build_eNB_args')
+ forced_workspace_cleanup = test.findtext('forced_workspace_cleanup')
+ if (forced_workspace_cleanup is None):
+ SSH.Build_eNB_forced_workspace_cleanup = False
+ else:
+ if re.match('true', forced_workspace_cleanup, re.IGNORECASE):
+ SSH.Build_eNB_forced_workspace_cleanup = True
+ else:
+ SSH.Build_eNB_forced_workspace_cleanup = False
SSH.eNB_instance = test.findtext('eNB_instance')
if (SSH.eNB_instance is None):
SSH.eNB_instance = '0'
diff --git a/ci-scripts/xml_files/gnb_usrp_build.xml b/ci-scripts/xml_files/gnb_usrp_build.xml
index 1b57c077bad..bba92930c51 100644
--- a/ci-scripts/xml_files/gnb_usrp_build.xml
+++ b/ci-scripts/xml_files/gnb_usrp_build.xml
@@ -34,6 +34,7 @@
<class>Build_eNB</class>
<desc>Build gNB (USRP)</desc>
<Build_eNB_args>--gNB -w USRP</Build_eNB_args>
+ <forced_workspace_cleanup>True</forced_workspace_cleanup>
</testCase>
</testCaseList>
--
GitLab