[DMAAP-MR] - Uplift jjb to Java 11 for Dmaap msgrtr and messageService
Signed-off-by: david.mcweeney <david.mcweeney@est.tech>
Change-Id: I42352f6775f151a69c210848a6f708eadeb6f5b3
Issue-ID: DMAAP-1563
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 64e9405..a6a2d83 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -15,17 +15,43 @@
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
+ project: 'dmaap/messagerouter/messageservice'
+ stream:
+ - 'honolulu':
+ branch: 'honolulu'
+ - 'guilin':
+ branch: 'guilin'
+ mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+ files: '**'
+ 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'
- - 'honolulu':
- branch: 'honolulu'
- - 'guilin':
- branch: 'guilin'
mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+ java-version: openjdk11
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 1772783..9ff9e9b 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