diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 115f8fb8a93b35a09dd5f594562be2d8fa3a7b10..4874ef1e33ba5e0f847c16c3bb0821315ae8aaae 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 39fd7931508dc9ec455677322f593ec3aece7ffc..cd7cc8edfdcf0550149b34e17be5c6bf7dd9a350 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]