From 110bb110a48b98a40dad33e80071e0a21386f11d Mon Sep 17 00:00:00 2001 From: Lasse Kaihlavirta Date: Tue, 15 Dec 2020 12:00:06 +0200 Subject: [PATCH] Separate snapshot tag var names from original - original tag variables in pom.xmls are being used also outside of the poms (namely, in Dockerfiles) and the new tag usage is not taken in use in all images yet, so the tag names are now differentiated to support old usage where necessary - add STAGING-latest tag in TagSnapshotVersion groovy script as a quick fix for odlsli-alpine dependencies for now - minor typo corrections Issue-ID: CCSDK-3019 Signed-off-by: Lasse Kaihlavirta Change-Id: Ib6b5e275ea305f5871f124da78a6e94b126c0266 --- dgbuilder-docker/pom.xml | 8 ++++---- odlsli/odlsli-alpine/pom.xml | 10 +++++----- odlsli/odlsli-alpine/src/main/docker/Dockerfile | 2 +- pom.xml | 2 +- src/main/scripts/TagSnapshotVersion.groovy | 11 +++++++---- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 3bcfff0e..6b88b557 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -183,10 +183,10 @@ ${basedir}/target/docker-stage Dockerfile - ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} - ${project.docker.uniquedockertag.version} + ${project.docker.latestminortag.snapshot.version} + ${project.docker.latestfulltag.snapshot.version} + ${project.docker.latesttagtimestamp.snapshot.version} + ${project.docker.uniquedockertag.snapshot.version} diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 69a5b920..847a4e69 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -606,10 +606,10 @@ ${basedir}/target/docker-stage Dockerfile - ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} - ${project.docker.uniquedockertag.version} + ${project.docker.latestminortag.snapshot.version} + ${project.docker.latestfulltag.snapshot.version} + ${project.docker.latesttagtimestamp.snapshot.version} + ${project.docker.uniquedockertag.snapshot.version} @@ -657,7 +657,7 @@ - ${image.name}:${project.docker.latesttagtimestamp.version} + ${image.name}:${project.docker.latesttagtimestamp.snapshot.version} odlsli-container diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index e8fa5ef6..adb686ab 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -17,7 +17,7 @@ COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg FROM ${base.image.name}:${project.docker.latestfulltag.version} -LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" +LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" USER root ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties diff --git a/pom.xml b/pom.xml index 23326af7..cafbad02 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ pom ccsdk-distribution - Creates distributuon bundles for CCSDK + Creates distribution bundles for CCSDK platform-logic diff --git a/src/main/scripts/TagSnapshotVersion.groovy b/src/main/scripts/TagSnapshotVersion.groovy index 97014743..410b980f 100644 --- a/src/main/scripts/TagSnapshotVersion.groovy +++ b/src/main/scripts/TagSnapshotVersion.groovy @@ -28,7 +28,10 @@ propertiesFile.withInputStream { properties.load(it) } -project.properties['project.docker.latestminortag.version']=properties.release_name + '.' + properties.sprint_number + "-SNAPSHOT-latest"; -project.properties['project.docker.latestfulltag.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-latest"; -project.properties['project.docker.latesttagtimestamp.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp']; -project.properties['project.docker.uniquedockertag.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['uniquedockertag']; +project.properties['project.docker.latestminortag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + "-SNAPSHOT-latest"; +project.properties['project.docker.latestfulltag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-latest"; +project.properties['project.docker.latesttagtimestamp.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp']; +project.properties['project.docker.uniquedockertag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['uniquedockertag']; + +// Temporary solution for odl-sodium-alpine dependence in odlsli-alpine image build +project.properties['project.docker.latestfulltag.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-STAGING-latest"; -- 2.16.6