diff --git a/ci-scripts/Jenkinsfile-GitHub-Docker b/ci-scripts/Jenkinsfile-GitHub-Docker index 9dce174..2483766 100644 --- a/ci-scripts/Jenkinsfile-GitHub-Docker +++ b/ci-scripts/Jenkinsfile-GitHub-Docker @@ -499,6 +499,36 @@ pipeline { } } } + stage ('Testing the 5GCN tutorials') { + steps { + script { + gitlabCommitStatus(name: "Test 5GCN tutorials") { + localStatus = build job: 'OAI-CN5G-Tutorials-Check', + parameters: [ + string(name: 'SPGWU_TAG', value: String.valueOf(spgwu_tag)), + string(name: 'SPGWU_BRANCH', value: String.valueOf(spgwu_branch)) + ], propagate: false + localResult = localStatus.getResult() + + if (localStatus.resultIsBetterOrEqualTo('SUCCESS')) { + echo "Tutorials Test Job is OK" + } else { + echo "Tutorials Test Job is KO" + sh "ci-scripts/fail.sh" + } + } + } + } + post { + always { + script { + copyArtifacts(projectName: 'OAI-CN5G-Tutorials-Check', + filter: '*_results_oai_cn5g*.html', + selector: lastCompleted()) + } + } + } + } } } // For the moment it is Docker-Hub, but we might have a new one internally. diff --git a/ci-scripts/generateHtmlReport.py b/ci-scripts/generateHtmlReport.py index 5fb8ae0..5c9bcdc 100644 --- a/ci-scripts/generateHtmlReport.py +++ b/ci-scripts/generateHtmlReport.py @@ -163,7 +163,9 @@ def generateHeader(self): self.file.write(buildSummary) cwd = os.getcwd() - test_reports = ['test_results_oai_epc', 'test_results_magma_epc_rhel8', 'test_results_oai_cn5g', 'test_results_oai_cn5g_oc'] + test_reports = ['test_results_oai_epc', 'test_results_magma_epc_rhel8', \ + 'test_results_oai_cn5g_basic', 'test_results_oai_cn5g_mini', \ + 'test_results_oai_cn5g_oc', 'test_results_oai_cn5g_tutorials'] for test in test_reports: if os.path.isfile(cwd + '/' + test + '.html'): newEpcReport = open(cwd + '/' + test + '_new.html', 'w')