From 36c818dcf47b3a339a00d5063b9aff467955c8a4 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 24 Nov 2021 18:28:51 +0100 Subject: [PATCH] Prevent tests Dockerfile to use cache of osm-packages repo Change-Id: I867590f408bb401f7bd66785645f7d185ce6861e Signed-off-by: garciadeblas --- docker/tests/Dockerfile | 1 + jenkins/ci-pipelines/ci_stage_3.groovy | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 115f8fb8..4874ef1e 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -54,6 +54,7 @@ RUN mv /usr/share/osm-tests/robot-systest /robot-systest RUN mv /usr/share/osm-tests/conformance-tests/ /robot-systest/ RUN mv /usr/share/osm-tests/charm.sh /usr/sbin/charm +ARG CACHE_DATE=not_a_date RUN git clone \ https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \ --recurse-submodules \ diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 39fd7931..cd7cc8ed 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -322,7 +322,8 @@ node("${params.NODE}") { usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) { sh "docker login ${INTERNAL_DOCKER_REGISTRY} -u ${USERNAME} -p ${PASSWORD}" } - moduleBuildArgs = "" + datetime = sh(returnStdout: true, script: "date +%Y-%m-%d:%H:%M:%S").trim() + moduleBuildArgs = " --build-arg CACHE_DATE=${datetime}" for (packageName in builtModules.keySet()) { envName=packageName.replaceAll("-","_").toUpperCase()+"_URL" moduleBuildArgs += " --build-arg ${envName}=" + builtModules[packageName] -- 2.25.1