aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2017-11-27 15:17:55 -0800
committerPatrick Brady <pb071s@att.com>2017-12-01 18:44:39 +0000
commitefc8ecc72f7069e2c8969eff5b6cc60b125905f2 (patch)
tree9984e4553669cac081227cf1e6db313f92c0b6f9
parentc9d8b5dd1a423bfdb87c7901209a84d93f33684d (diff)
Add appc version properties
(cherry-pick from master) When we increment the version of the deployment project, builds will currently break since the version will be one ahead of the released version of appc. Adding properties to define the version of appc to download. Also adding a script to determine when snapshot or release version should be used. Change-Id: I8e98dbc8ca79e0ec6a02fb011c17053c728c351d Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: CIMAN-120
-rw-r--r--installation/appc/pom.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index db6b673..c1885a1 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -19,7 +19,8 @@
<properties>
<image.name>openecomp/appc-image</image.name>
- <appc.version>${project.version}</appc.version>
+ <appc.release.version>1.2.0</appc.release.version>
+ <appc.snapshot.version>1.2.1-SNAPSHOT</appc.snapshot.version>
<!--This version will be over-ridden by jenkins
injecting the version.properties variable file during docker build-->
<appc.docker.staging.version>1.0.0</appc.docker.staging.version>
@@ -216,9 +217,11 @@
if ( project.properties['ver'].endsWith("-amsterdam") ) {
project.properties['dockertag1']=project.properties['ver'] + "-latest";
project.properties['dockertag2']="latest";
+ project.properties['appc.version']=project.properties['appc.snapshot.version'];
} else {
project.properties['dockertag1']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
+ project.properties['appc.version']=project.properties['appc.release.version'];
}
println 'docker tag 1: ' + project.properties['dockertag1'];
println 'docker tag 2: ' + project.properties['dockertag2'];