diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2019-07-01 15:25:05 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2019-07-01 15:32:41 -0700 |
| commit | baba9c90a1cb644e3093d63cbee249282d11caf7 (patch) | |
| tree | 9561db74e1acc97d1ef8faae50b4d4b4692fbfae /jjb | |
| parent | 5683a18cd671d705b8596df5a5c04fd08fda8bb9 (diff) | |
Fix DMAAP maven-docker-stage
mvn-goals were switched by mvn-params.
Fix this variable.
Fix params to include -P docker for docker
profile.
Remove dmaap-kafka-maven-stage-master. Kafka
only produces docker images.
Change-Id: If4c74fb7b1a212e54b04468b7769a128fde2b346
Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/dmaap/dmaap-kafka-docker.yaml | 2 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-kafka.yaml | 4 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-messagerouter-docker.yaml | 2 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-zookeeper.yaml | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml index ba433f7c8..0de9ec3f2 100644 --- a/jjb/dmaap/dmaap-kafka-docker.yaml +++ b/jjb/dmaap/dmaap-kafka-docker.yaml @@ -11,7 +11,7 @@ - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true - mvn-goals: '-Dmaven.test.skip=true' + mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' project: 'dmaap/kafka11aaf' diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml index 85c5f746b..7b1573ce3 100644 --- a/jjb/dmaap/dmaap-kafka.yaml +++ b/jjb/dmaap/dmaap-kafka.yaml @@ -5,10 +5,6 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true project: 'dmaap/kafka11aaf' stream: - 'master': diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index 30d68665a..f189c4ecd 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -10,7 +10,7 @@ mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g - mvn-goals: '-Dmaven.test.skip=true' + mvn-params: '-P docker -Dmaven.test.skip=true' maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml index 77416d1dc..47c7f3245 100644 --- a/jjb/dmaap/dmaap-zookeeper.yaml +++ b/jjb/dmaap/dmaap-zookeeper.yaml @@ -20,7 +20,7 @@ mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g - mvn-goals: '-Dmaven.test.skip=true' + mvn-params: '-P docker -Dmaven.test.skip=true' maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' |