diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2017-09-28 16:28:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-28 16:28:39 +0000 |
| commit | 4ef467708432cd490888d1ff0f91f03c56f759e1 (patch) | |
| tree | 2b35e7a2d8e107d2e632517f4f10d3e3f2ecf147 /jjb | |
| parent | e435c240840356b5ab7181f8575f32aadd66932a (diff) | |
| parent | d91a33ad3e3b07c456a2602ea824b69e2f1b3554 (diff) | |
Merge "Add step for version to release-checkstyle"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/aaf/aaf-authz-docker.yaml | 1 | ||||
| -rw-r--r-- | jjb/clamp/clamp.yaml | 1 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 16 |
3 files changed, 18 insertions, 0 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml index d3e75b478..609aab3ba 100644 --- a/jjb/aaf/aaf-authz-docker.yaml +++ b/jjb/aaf/aaf-authz-docker.yaml @@ -11,6 +11,7 @@ - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 - '{project-name}-{stream}-release-java-daily-checkstyle': + setVersion: 'DontSetVersion' mvn_properties: - skipDockerBuild=true - skipDockerTag=true diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index d5b04fecb..da9bc2548 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -10,6 +10,7 @@ - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 - '{project-name}-{stream}-release-java-daily-checkstyle': + setVersion: 'DoSetVersion' mvn_properties: - skipDockerBuild=true - skipDockerTag=true diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 5e69145a0..adfd3717d 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -477,6 +477,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 - maven-target: maven-version: '{maven-version}' goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B |