From 329a823d5da4fa65fcfab17202fece57b358d3c9 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Sat, 28 Nov 2020 22:40:29 +0100
Subject: [PATCH] CI: fix image build log collection

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
 ci-scripts/cls_oaicitest.py              |  2 +-
 ci-scripts/main.py                       |  4 +---
 ci-scripts/ran.py                        |  7 +++++--
 ci-scripts/xml_class_list.yml            |  1 -
 ci-scripts/xml_files/fr1_image_build.xml | 10 ----------
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 4dcfa694a1..33fba12770 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -3085,7 +3085,7 @@ class OaiCiTest():
 		SSH.command('cd ' + SourceCodePath, '\$', 5)
 		SSH.command('cd cmake_targets', '\$', 5)
 		SSH.command('rm -f build.log.zip', '\$', 5)
-		SSH.command('zip build.log.zip build_log_*/*', '\$', 60)
+		SSH.command('zip -r build.log.zip build_log_*/*', '\$', 60)
 		SSH.close()
 
 	def LogCollectPing(self,EPC):
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 08d8938080..1b350ad195 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -128,7 +128,7 @@ def GetParametersFromXML(action):
 			else:
 				RAN.backgroundBuild=False
 
-	elif action == 'WaitEndBuild_eNB' or action == 'WaitEndBuild_Image':
+	elif action == 'WaitEndBuild_eNB':
 		RAN.Build_eNB_args=test.findtext('Build_eNB_args')
 		RAN.imageKind=test.findtext('kind')
 		eNB_instance=test.findtext('eNB_instance')
@@ -646,8 +646,6 @@ elif re.match('^TesteNB$', mode, re.IGNORECASE) or re.match('^TestUE$', mode, re
 					RAN.BuildImage()
 				elif action == 'WaitEndBuild_eNB':
 					RAN.WaitBuildeNBisFinished()
-				elif action == 'WaitEndBuild_Image':
-					RAN.WaitBuildImageisFinished()
 				elif action == 'Initialize_eNB':
 					check_eNB = False
 					check_OAI_UE = False
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index e534b31b9c..d555558fc9 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -470,14 +470,17 @@ class RANManagement():
 		# Recover build logs, for the moment only possible when build is successful
 		mySSH.command('docker create --name test ran-build:' + imageTag, '\$', 5)
 		mySSH.command('mkdir -p cmake_targets/log/ran-build', '\$', 5)
-		mySSH.command('docker cp test:/oai-ran/cmake_targets/log/. /tmp/CI-eNB/cmake_targets/log/ran-build', '\$', 5)
+		mySSH.command('docker cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/ran-build', '\$', 5)
 		mySSH.command('docker rm -f test', '\$', 5)
 		for image,shaone in danglingShaOnes:
 			mySSH.command('mkdir -p cmake_targets/log/' + image, '\$', 5)
 			mySSH.command('docker create --name test ' + shaone, '\$', 5)
-			mySSH.command('docker cp test:/oai-ran/cmake_targets/log/. /tmp/CI-eNB/cmake_targets/log/' + image, '\$', 5)
+			mySSH.command('docker cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/' + image, '\$', 5)
 			mySSH.command('docker rm -f test', '\$', 5)
 		mySSH.command('docker image prune --force', '\$', 5)
+		mySSH.command('cd cmake_targets', '\$', 5)
+		mySSH.command('mkdir -p build_log_' + self.testCase_id, '\$', 5)
+		mySSH.command('mv log/* ' + 'build_log_' + self.testCase_id, '\$', 5)
 		mySSH.close()
 
 		logging.info('\u001B[1m Building OAI Image(s) Pass\u001B[0m')
diff --git a/ci-scripts/xml_class_list.yml b/ci-scripts/xml_class_list.yml
index db4d946d18..66c9682ba6 100755
--- a/ci-scripts/xml_class_list.yml
+++ b/ci-scripts/xml_class_list.yml
@@ -3,7 +3,6 @@
   - Build_eNB
   - Build_Image
   - WaitEndBuild_eNB
-  - WaitEndBuild_Image
   - Initialize_eNB
   - Terminate_eNB
   - Initialize_UE
diff --git a/ci-scripts/xml_files/fr1_image_build.xml b/ci-scripts/xml_files/fr1_image_build.xml
index 0c8be40f17..9dd386b646 100644
--- a/ci-scripts/xml_files/fr1_image_build.xml
+++ b/ci-scripts/xml_files/fr1_image_build.xml
@@ -19,7 +19,6 @@
  For more information about the OpenAirInterface (OAI) Software Alliance:
       contact@openairinterface.org
 
- 000004
 -->
 <testCaseList>
 	<htmlTabRef>build-tab</htmlTabRef>
@@ -36,15 +35,6 @@
 		<kind>all</kind>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
-		<backgroundBuild>True</backgroundBuild>
-	</testCase>
-
-	<testCase id="000004">
-		<class>WaitEndBuild_Image</class>
-		<desc>Wait for end of Build eNB</desc>
-		<kind>eNB</kind>
-		<eNB_instance>0</eNB_instance>
-		<eNB_serverId>0</eNB_serverId>
 	</testCase>
 
 </testCaseList>