[DMAAP] Add/remove branch merge jobs
Change-Id: I566a7c9e839bda382ef0ca1b86f20370f5616c0c
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: DMAAP-1512
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 39a6a37..1a29146 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -22,33 +22,13 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
+ - 'guilin':
+ branch: 'guilin'
mvn-settings: 'dmaap-buscontroller-settings'
files: '**'
archive-artifacts: ''
java-version: openjdk11
-- project:
- name: dmaap-buscontroller-java8
- project-name: 'dmaap-buscontroller'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - 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: 'dmaap/buscontroller'
- stream:
- - 'elalto':
- branch: 'elalto'
- mvn-settings: 'dmaap-buscontroller-settings'
- files: '**'
- archive-artifacts: ''
- java-version: openjdk8
-
# 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.