Merge branch 'adding-reporting' into 'develop'

CI: adding HTML reporting

See merge request !2

.dockerignore

+openair-upf.tar.bz2

.gitignore

+archives/
+*.html
+openair-upf.tar.bz2

ci-scripts/Jenkinsfile-GitLab-Docker

@@ -273,16 +273,16 @@ pipeline {
         }
 
         // Generating the HTML report
-//        if ("MERGE".equals(env.gitlabActionType)) {
-//          sh "python3 ci-scripts/generateHtmlReport.py --job_name=${JOB_NAME} --job_id=${BUILD_ID} --job_url=${BUILD_URL} --git_url=${GIT_URL} --git_src_branch=${env.gitlabSourceBranch} --git_src_commit=${env.gitlabMergeRequestLastCommit} --git_pull_request=True --git_target_branch=${env.gitlabTargetBranch} --git_target_commit=${GIT_COMMIT}"
-//          if (fileExists('test_results_oai_upf.html')) {
+        if ("MERGE".equals(env.gitlabActionType)) {
+          sh "python3 ci-scripts/generateHtmlReport.py --job_name=${JOB_NAME} --job_id=${BUILD_ID} --job_url=${BUILD_URL} --git_url=${GIT_URL} --git_src_branch=${env.gitlabSourceBranch} --git_src_commit=${env.gitlabMergeRequestLastCommit} --git_pull_request=True --git_target_branch=${env.gitlabTargetBranch} --git_target_commit=${GIT_COMMIT}"
+          if (fileExists('test_results_oai_upf.html')) {
 //            sh "sed -i -e 's#TEMPLATE_MERGE_REQUEST_LINK#${gitlabMergeRequestLink}#g' test_results_oai_upf.html"
-//            sh "sed -i -e 's#TEMPLATE_MERGE_REQUEST_TEMPLATE#${env.gitlabMergeRequestTitle}#' test_results_oai_upf.html"
-//          }
-//        } else {
-//          sh "python3 ci-scripts/generateHtmlReport.py --job_name=${JOB_NAME} --job_id=${BUILD_ID} --job_url=${BUILD_URL} --git_url=${GIT_URL} --git_src_branch=${GIT_BRANCH} --git_src_commit=${GIT_COMMIT}"
-//        }
-//        sh "sed -i -e 's#TEMPLATE_TIME#${JOB_TIMESTAMP}#' test_results_oai_upf.html"
+            sh "sed -i -e 's#TEMPLATE_MERGE_REQUEST_TEMPLATE#${env.gitlabMergeRequestTitle}#' test_results_oai_upf.html"
+          }
+        } else {
+          sh "python3 ci-scripts/generateHtmlReport.py --job_name=${JOB_NAME} --job_id=${BUILD_ID} --job_url=${BUILD_URL} --git_url=${GIT_URL} --git_src_branch=${GIT_BRANCH} --git_src_commit=${GIT_COMMIT}"
+        }
+        sh "sed -i -e 's#TEMPLATE_TIME#${JOB_TIMESTAMP}#' test_results_oai_upf.html"
         if (fileExists('test_results_oai_upf.html')) {
           sh "sed -i -e 's#TEMPLATE_TIME#${JOB_TIMESTAMP}#' test_results_oai_upf.html"
           archiveArtifacts artifacts: 'test_results_oai_upf.html'

docker/Dockerfile.upf-vpp.ubuntu18

@@ -39,6 +39,7 @@ RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt-get install --yes \
         git \
         sudo \
+        python3 \
         wget \
         make \
         build-essential \