[DMAAP] Add/remove branch merge jobs

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

diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index 5793822..cfe816d 100644 (file)
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: dmaap-dbcapi
+    name: dmaap-dbcapi-java11
     project-name: 'dmaap-dbcapi'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -11,13 +11,14 @@
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-
     project: 'dmaap/dbcapi'
     mvn-settings: 'dmaap-dbcapi-settings'
     java-version: openjdk11
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
     # 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
@@ -26,6 +27,7 @@
     files: '**'
     archive-artifacts: ''
 
+
 - project:
     name: dmaap-dbcapi-sonar
     jobs:
@@ -36,7 +38,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/dbcapi'
     project-name: 'dmaap-dbcapi'
     branch: 'master'