summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/dmaap/dmaap-buscontroller.yaml24
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml20
-rw-r--r--jjb/dmaap/dmaap-dbcapi.yaml28
-rw-r--r--jjb/dmaap/dmaap-kafka.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-messageservice.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-mirroragent.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter-msgrtr.yaml2
-rw-r--r--jjb/dmaap/dmaap-zookeeper.yaml2
9 files changed, 16 insertions, 68 deletions
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 39a6a379c..1a291462f 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.
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 1985fac02..3e3676bc0 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -24,26 +24,6 @@
- project:
- name: dmaap-datarouter-java8
- project-name: 'dmaap-datarouter'
- 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/datarouter'
- stream:
- - 'frankfurt':
- branch: 'frankfurt'
- mvn-settings: 'dmaap-datarouter-settings'
- files: '**'
- archive-artifacts: ''
- java-version: openjdk8
-
-- project:
name: dmaap-datarouter-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index 4eeafa958..cfe816d8c 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -17,32 +17,8 @@
stream:
- 'master':
branch: 'master'
- - 'frankfurt':
- branch: 'frankfurt'
- # 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
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
-
-- project:
- name: dmaap-dbcapi-java8
- project-name: 'dmaap-dbcapi'
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- project: 'dmaap/dbcapi'
- mvn-settings: 'dmaap-dbcapi-settings'
- java-version: openjdk8
- stream:
- - 'elalto':
- branch: 'elalto'
+ - '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
diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml
index 350eb0308..65d7dbcf4 100644
--- a/jjb/dmaap/dmaap-kafka.yaml
+++ b/jjb/dmaap/dmaap-kafka.yaml
@@ -9,6 +9,8 @@
stream:
- 'master':
branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
mvn-settings: 'dmaap-kafka11aaf-settings'
- project:
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 6549204a2..f84117476 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 3c0df034a..5f3858bc0 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
mvn-settings: 'dmaap-messagerouter-messageservice-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 331176ad3..a90b327ed 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 2d872f748..7e2271638 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml
index 4a0b523bd..5854bcca5 100644
--- a/jjb/dmaap/dmaap-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-zookeeper.yaml
@@ -9,6 +9,8 @@
stream:
- 'master':
branch: 'master'
+ - 'guilin':
+ branch: 'guilin'
mvn-settings: 'dmaap-zookeeper-settings'
- project:
name: dmaap-zookeeper-docker