From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Thu, 19 Oct 2017 15:15:53 +0000 (+0000)
Subject: Merge "Add step for version to docker java properties"
X-Git-Tag: 1.0.0-Amsterdam~41
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8db9f78fdc6093c0f117160ee9fb29f5c9404865;hp=6eaf6a85421dd425337ea1812983f89ee1082bb6;p=ci-management.git

Merge "Add step for version to docker java properties"
---

diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml
index 332885697..754fbddd3 100644
--- a/jjb/aaf/aaf-authz-docker.yaml
+++ b/jjb/aaf/aaf-authz-docker.yaml
@@ -18,6 +18,7 @@
           - skipDockerTag=true
           - skipDockerPush=true
       - '{project-name}-{stream}-docker-java-properties-daily':
+         setVersion: 'DontSetVersion'
          docker-pom: 'authz-service/pom.xml'
          mvn-profile: 'docker'
          maven-properties: |
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index da9bc2548..746caa0ea 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -16,6 +16,7 @@
           - skipDockerTag=true
           - skipDockerPush=true
       - '{project-name}-{stream}-docker-java-properties-daily':
+         setVersion: 'DoSetVersion'
          docker-pom: 'pom.xml'
          mvn-profile: 'docker'
          maven-properties: |
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index be02418eb..e31a470df 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1458,6 +1458,22 @@
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: DoSetVersion
+          label: '{setVersion}'
+          steps:
+            - inject:
+                properties-file: version.properties
+            - maven-target:
+                maven-version: '{maven-version}'
+                goals: 'versions:set versions:update-child-modules versions:commit -B'
+                properties:
+                  - 'newVersion=${{release_version}}'
+                settings: '{mvn-settings}'
+                settings-type: cfp
+                global-settings: 'global-settings'
+                global-settings-type: cfp
       - docker-login
       - maven-docker-push-daily:
           maven-version: '{maven-version}'