diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-08-08 14:56:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-08-08 14:56:17 +0000 |
| commit | 0039d14e69b97728240d502c5c1b6a7504980909 (patch) | |
| tree | 07a9a96cd145b2de1f5192e9240f78c9f4c47a52 | |
| parent | 7f81378b4543e7aea1ad99ecadebc585ede6f471 (diff) | |
| parent | c9d90e2391a57ad29688fdfe694faecc1e4468ab (diff) | |
Merge "Pass mvn properties as string"
| -rw-r--r-- | jjb/clamp/clamp.yaml | 12 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index 1004a2c9c..d5b04fecb 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -6,12 +6,14 @@ jobs: - '{project-name}-{stream}-verify-java-checkstyle' - '{project-name}-{stream}-merge-properties-java': - maven-properties: | - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 + mvn_properties: + - docker.pull.registry=nexus3.onap.org:10001 + - docker.push.registry=nexus3.onap.org:10003 - '{project-name}-{stream}-release-java-daily-checkstyle': - maven-deploy-properties: | - skipDockerBuild + mvn_properties: + - skipDockerBuild=true + - skipDockerTag=true + - skipDockerPush=true - '{project-name}-{stream}-docker-java-properties-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index c5803dcb8..3146d6ead 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -479,8 +479,7 @@ maven-version: '{maven-version}' goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' + properties: '{obj:mvn_properties}' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -826,7 +825,7 @@ settings-type: cfp global-settings: 'global-settings' global-settings-type: cfp - properties: '{maven-properties}' + properties: '{obj:mvn_properties}' publishers: - infra-shiplogs: |