[DMAAP] Add/remove branch merge jobs

[ci-management.git] / jjb / dmaap / dmaap-buscontroller.yaml

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index dc7ecfa..1a29146 100644 (file)
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -6,30 +6,28 @@
       - project-view
 
 - project:
-    name: dmaap-buscontroller
+    name: dmaap-buscontroller-java11
     project-name: 'dmaap-buscontroller'
     jobs:
       - '{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: ubuntu1804-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/buscontroller'
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
-
+    java-version: openjdk11
 
 # removed sonar job from this template because this repo only builds a docker container
 # and the 0% coverage report from Sonar was causing repeated escalations.
@@ -38,7 +36,17 @@
     name: dmaap-buscontroller-clm
     jobs:
       - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
     project: dmaap/buscontroller
     project-name: 'dmaap-buscontroller'
     branch: 'master'
     mvn-settings: 'dmaap-buscontroller-settings'
+
+- project:
+    name: dmaap-buscontroller-info
+    project-name: dmaap-buscontroller
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: dmaap/buscontroller
+    branch: master