Merge "Modified site pom and docker config"

5 files changed, 12 insertions, 23 deletions

diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 6ed9d2f62..655be2e6c 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -8,7 +8,7 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'dmaap/dmaapclient/pom.xml'
+          site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
           mvn-goals: 'clean install'
     project: 'dmaap/messagerouter/dmaapclient'
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index 60133ee5e..26a23d2b8 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -5,25 +5,12 @@
     project-name: 'dmaap-messsagerouter-docker'
     jobs:
       - '{project-name}-{stream}-clm'
-      - '{project-name}-{stream}-verify-java-checkstyle'
-      - '{project-name}-{stream}-merge-properties-java':
-         mvn_properties:
-            - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-{stream}-release-java-daily-checkstyle':
-         mvn_properties:
-          - skipDockerBuild=true
-          - skipDockerTag=true
-          - skipDockerPush=true
-      - '{project-name}-{stream}-docker-java-properties-daily':
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         maven-properties: |
-          skip.docker.build=false
-          skip.docker.tag=false
-          skip.docker.push=false
-          dmaap-messsagerouter-docker.registry=$
-
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-daily'
+      - '{project-name}-{stream}-docker-version-java-daily'
+      - '{project-name}-docker-image-blessing'
     project: 'dmaap/messagerouter/messageservice'
     stream:
       - 'master':
@@ -31,4 +18,6 @@
     mvn-settings: 'dmaap-messsagerouter-messageservice-settings'
     files: '**'
     archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: 'docker'
     build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 3672b5a27..5c5a78137 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -8,7 +8,7 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'dmaap/messageservice/pom.xml'
+          site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
           mvn-goals: 'clean install'
     project: 'dmaap/messagerouter/messageservice'
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 20dbd21f6..5f4a16703 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -8,7 +8,7 @@
       - '{project-name}-{stream}-merge-java'

       - '{project-name}-{stream}-release-version-java-daily'

       - '{project-name}-{stream}-stage-site-java':

-          site-pom: 'dmaap/mirroragent/pom.xml'

+          site-pom: 'pom.xml'

           trigger-job: '{project-name}-{stream}-release-version-java-daily'

           mvn-goals: 'clean install'

     project: 'dmaap/messagerouter/mirroragent'

diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index f5e8c109c..a2bba7f44 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -8,7 +8,7 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'dmaap/msgrtr/pom.xml'
+          site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
           mvn-goals: 'clean install'
     project: 'dmaap/messagerouter/msgrtr'