diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-03-15 16:16:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-15 16:16:58 +0000 |
| commit | 4aae6c51ad262db2bfd8f279a58077fa12898a27 (patch) | |
| tree | 607e6180beee52bc3fe2fadc26051c595634b05a | |
| parent | 9acc1f993b96cd1315869f7567fb1d36434d61b2 (diff) | |
| parent | 2d7c6a09babf8e08c0cd73a6564a888d857c73dd (diff) | |
Merge "Change to mvn-targets"
| -rw-r--r-- | jjb/dmaap/dmaap-buscontroller.yaml | 4 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-dbcapi.yaml | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 53e1922da..7db34c760 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -9,10 +9,10 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': + mvn-goals: 'clean package docker:build -DpushImage' docker-pom: 'pom.xml' mvn-profile: 'docker' - mvn-goals: 'clean install docker:build' - build-node: ubuntu1604-docker-8c-8g + project: 'dmaap/buscontroller' stream: - 'master': diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 06f6b81f6..602734c79 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -8,12 +8,18 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' project: 'dmaap/dbcapi' + mvn-settings: 'dmaap-dbcapi-settings' stream: - 'master': branch: 'master' - mvn-settings: 'dmaap-dbcapi-settings' + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true files: '**' archive-artifacts: '' + - project: name: dmaap-dbcapi-sonar jobs: |