From 110bb110a48b98a40dad33e80071e0a21386f11d Mon Sep 17 00:00:00 2001 From: Lasse Kaihlavirta Date: Tue, 15 Dec 2020 12:00:06 +0200 Subject: 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 --- src/main/scripts/TagSnapshotVersion.groovy | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/main') 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"; -- cgit 1.2.3-korg