summaryrefslogtreecommitdiffstats
path: root/jjb/dmaap
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2021-04-06 20:19:18 +0000
committerGerrit Code Review <gerrit@onap.org>2021-04-06 20:19:18 +0000
commit2b51d118c8d573aadbc5924add972fe99c211cba (patch)
treeef7e452a1bb41aa5f70ed943443cf6bf027a53b3 /jjb/dmaap
parent1773edb4a882fff21934583307903958dbf9c69b (diff)
parent09c75679f5e0aaba91b247ae7b98477d5c17c805 (diff)
Merge "[DMAAP-MR] - Uplift jjb to Java 11 for Dmaap msgrtr and messageService"
Diffstat (limited to 'jjb/dmaap')
-rw-r--r--jjb/dmaap/dmaap-messagerouter-messageservice.yaml34
-rw-r--r--jjb/dmaap/dmaap-messagerouter-msgrtr.yaml26
2 files changed, 52 insertions, 8 deletions
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 64e940591..a6a2d8313 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -15,12 +15,8 @@
maven-versions-plugin: true
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/messagerouter/messageservice'
stream:
- - 'master':
- branch: 'master'
- 'honolulu':
branch: 'honolulu'
- 'guilin':
@@ -30,6 +26,36 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: 'docker'
+ crom: ''
+
+- project:
+ name: dmaap-messagerouter-messageservice-java-11
+ project-name: 'dmaap-messagerouter-messageservice-java-11'
+ 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
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ mvn-params: '-P docker -Dmaven.test.skip=true'
+ maven-versions-plugin: true
+ 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/messagerouter/messageservice'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+ java-version: openjdk11
+ files: '**'
+ archive-artifacts: ''
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
- project:
name: dmaap-messagerouter-messageservice-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 1772783ec..9ff9e9b86 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -9,13 +9,9 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
project: 'dmaap/messagerouter/msgrtr'
stream:
- - 'master':
- branch: 'master'
- 'honolulu':
branch: 'honolulu'
- 'guilin':
@@ -23,6 +19,28 @@
mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
files: '**'
archive-artifacts: ''
+ cron: ''
+
+- project:
+ name: dmaap-messagerouter-msgrtr-java-11
+ project-name: 'dmaap-messagerouter-msgrtr-java-11'
+ 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-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+ project: 'dmaap/messagerouter/msgrtr'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
+ java-version: openjdk11
+ files: '**'
+ archive-artifacts: ''
- project:
name: dmaap-messagerouter-msgrtr-sonar