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>

diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
index ba433f7..0de9ec3 100644 (file)
--- 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 85c5f74..7b1573c 100644 (file)
--- 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 30d6866..f189c4e 100644 (file)
--- 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 77416d1..47c7f32 100644 (file)
--- 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'