Change to mvn-targets

to push docker container to nexus
patch2 to fix format
patch3 to add docker-pom
patch4 adds mvn-profile to dmaap-buscontroller.yaml
       and  mvn-deploy-properties to dmaap-dbcapi.yaml
patch5 remove bad chars!
patch6 add mvn-settings

Change-Id: I848a63dec7116136c93d60a664a09232be653b8a
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-327
Signed-off-by: dglFromAtt <dgl@research.att.com>

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 53e1922..7db34c7 100644 (file)
--- 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 06f6b81..602734c 100644 (file)
--- 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: