summaryrefslogtreecommitdiffstats
path: root/src/main/scripts
diff options
context:
space:
mode:
authorLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2020-12-15 12:00:06 +0200
committerLasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>2020-12-16 15:59:43 +0200
commit110bb110a48b98a40dad33e80071e0a21386f11d (patch)
tree0454d4a7fbc89fe3fcd70b1defa75af3bf6b94cc /src/main/scripts
parenta79c328f0fdf4ec9b2125a4b3df8192da3247f32 (diff)
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 <l.kaihlavirt@partner.samsung.com> Change-Id: Ib6b5e275ea305f5871f124da78a6e94b126c0266
Diffstat (limited to 'src/main/scripts')
-rw-r--r--src/main/scripts/TagSnapshotVersion.groovy11
1 files changed, 7 insertions, 4 deletions
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";