X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmaap%2Fdmaap-datarouter.yaml;h=3905b029405e23e3e131eb05b897323c5c11eab0;hb=70618efce314f27dd6126506e0755aef0dc4621f;hp=da0088deab4d30cf4659694b14ab08bb2cbccc2b;hpb=993a3b00e36c64473ae40fdec546690b1695340f;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index da0088dea..3905b0294 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -2,24 +2,22 @@
     name: dmaap-datarouter
     project-name: 'dmaap-datarouter'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      #
-      # see DMAAP-334 for more details, but
-      #     - '{project-name}-{stream}-docker-java-daily':
-      # doesn't support mvn-goals override, so trying this...
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean package -P docker docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          mvn-goals: 'clean package -P docker docker:build docker:push'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'dmaap/datarouter'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
@@ -28,7 +26,7 @@
     name: dmaap-datarouter-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
+    cron: '@daily'
     build-node: ubuntu1604-builder-4c-4g
     project: 'dmaap/datarouter'
     project-name: 'dmaap-datarouter'
@@ -37,3 +35,20 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+- project:
+    name: dmaap-datarouter-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: dmaap/datarouter
+    project-name: 'dmaap-datarouter'
+    branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
+
+- project:
+    name: dmaap-datarouter-info
+    project-name: dmaap-datarouter
+    jobs:
+      - gerrit-info-yaml-verify
+    project: dmaap/datarouter
+    branch: master