Separate snapshot tag var names from original

[ccsdk/distribution.git] / src / main / scripts / TagSnapshotVersion.groovy

diff --git a/src/main/scripts/TagSnapshotVersion.groovy b/src/main/scripts/TagSnapshotVersion.groovy
index 9701474..410b980 100644 (file)
--- 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";