From bbb7489983df84f1501a6a46845668e34a11ba15 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Thu, 18 Mar 2021 13:51:40 +0100
Subject: [PATCH] CI: better reporting
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/Jenkinsfile-tmp-ran | 2 +-
ci-scripts/cls_containerize.py | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ci-scripts/Jenkinsfile-tmp-ran b/ci-scripts/Jenkinsfile-tmp-ran
index 92f5db952fb..7d5307620f0 100644
--- a/ci-scripts/Jenkinsfile-tmp-ran
+++ b/ci-scripts/Jenkinsfile-tmp-ran
@@ -518,7 +518,7 @@ pipeline {
// Making sure that we really shutdown every thing before leaving
failure {
script {
- if ((!termStatusArray[termUE]) && (params.ADBIPAddress != "none")) {
+ if ((!termStatusArray[termUE]) && (params.ADB_IPAddress != "none")) {
withCredentials([
[$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.ADB_Credentials}", usernameVariable: 'ADB_Username', passwordVariable: 'ADB_Password']
]) {
diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py
index a3bb6eeefca..cb5aacb4bce 100644
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -189,8 +189,6 @@ class Containerize():
mySSH.command('sudo cp /etc/rhsm/ca/redhat-uep.pem tmp/ca/', '\$', 5)
mySSH.command('sudo cp /etc/pki/entitlement/*.pem tmp/entitlement/', '\$', 5)
- #mySSH.close()
- #return 0
sharedimage = 'ran-build'
# Let's remove any previous run artifacts if still there
mySSH.command(self.cli + ' image prune --force', '\$', 5)
@@ -214,7 +212,6 @@ class Containerize():
danglingShaOnes.append((image, result.group('imageShaOne')))
previousImage = image + ':' + imageTag
- imageTag = 'ci-temp'
# First verify if images were properly created.
status = True
mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' ' + sharedimage + ':' + imageTag, '\$', 5)
@@ -286,14 +283,16 @@ class Containerize():
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()
- mySSH.command('cd /tmp/CI-eNB/cmake_targets', '\$', 5)
+ mySSH.command('cd ' + lSourcePath + '/cmake_targets', '\$', 5)
+ mySSH.command('rm -f build_log_' + self.testCase_id + '.zip || true', '\$', 5)
if (os.path.isfile('./build_log_' + self.testCase_id + '.zip')):
os.remove('./build_log_' + self.testCase_id + '.zip')
+ if (os.path.isdir('./build_log_' + self.testCase_id)):
+ shutil.rmtree('./build_log_' + self.testCase_id)
mySSH.command('zip -r -qq build_log_' + self.testCase_id + '.zip build_log_' + self.testCase_id, '\$', 5)
mySSH.copyin(lIpAddr, lUserName, lPassWord, lSourcePath + '/cmake_targets/build_log_' + self.testCase_id + '.zip', '.')
- #mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)
+ mySSH.command('rm -f build_log_' + self.testCase_id + '.zip','\$', 5)
mySSH.close()
ZipFile('build_log_' + self.testCase_id + '.zip').extractall('.')
--
GitLab