diff --git a/ci-scripts/Jenkinsfile-physim-deploy b/ci-scripts/Jenkinsfile-physim-deploy index 2bdcac42aa..d66ef8b3ff 100644 --- a/ci-scripts/Jenkinsfile-physim-deploy +++ b/ci-scripts/Jenkinsfile-physim-deploy @@ -211,10 +211,14 @@ pipeline { script { dir ('ci-scripts') { // Zipping all archived log files - sh "zip -r -qq physim_deploytest_logs_${env.BUILD_ID}.zip physim_test_logs_*/*" - sh "rm -rf physim_test_logs_*/" - if (fileExists("physim_deploytest_logs_${env.BUILD_ID}.zip")) { - archiveArtifacts artifacts: "physim_deploytest_logs_${env.BUILD_ID}.zip" + sh "zip -r -qq test_logs_${env.BUILD_ID}.zip *log*" + sh "rm -r *.log" + if (fileExists("test_logs_${env.BUILD_ID}.zip")) { + archiveArtifacts artifacts: "test_logs_${env.BUILD_ID}.zip" + } + if (fileExists("test_logs_CN.zip")){ + sh "mv test_logs_CN.zip test_logs_CN_${env.BUILD_ID}.zip" + archiveArtifacts artifacts: "test_logs_CN_${env.BUILD_ID}.zip" } if (fileExists("test_results.html")) { sh "mv test_results.html test_results-${env.JOB_NAME}.html" diff --git a/ci-scripts/epc.py b/ci-scripts/epc.py index 4899319e11..bc5aa831f3 100644 --- a/ci-scripts/epc.py +++ b/ci-scripts/epc.py @@ -615,7 +615,8 @@ class EPCManagement(): mySSH.run(f'oc logs -f {podName} -c {ii} &> {lSourcePath}/logs/{ii}.log &') mySSH.run(f'helm uninstall {ii}') podName = '' - mySSH.run(f'cd {lSourcePath}/logs && zip -r -qq {self.eNBSourceCodePath}/ci-scripts/CN_logs.zip *.log') + mySSH.run(f'cd {lSourcePath}/logs && zip -r -qq {self.eNBSourceCodePath}/ci-scripts/test_logs_CN.zip *.log') + mySSH.copyin(f'{self.eNBSourceCodePath}/ci-scripts/test_logs_CN.zip','test_logs_CN.zip') ret = mySSH.run(f'oc get pods', silent=True) res = re.search('No resources found in oaicicd-ran namespace.', ret.stdout) if res is not None: