summaryrefslogtreecommitdiffstats
path: root/jjb/dmaap
diff options
context:
space:
mode:
authorefiacor <fiachra.corcoran@est.tech>2020-04-10 13:57:49 +0100
committerefiacor <fiachra.corcoran@est.tech>2020-04-10 16:01:23 +0100
commit577c6037118426577dfc941e5b60b6f0b108b435 (patch)
tree80998fb82a63940093740e8e97df52b5c2cfe0e8 /jjb/dmaap
parenta645255a2b7e1665fd252d71d13749f1186bc348 (diff)
Fix java version for DMaaP DR
Change-Id: If03931f341b24c910af574ac08378c4c615626be Signed-off-by: efiacor <fiachra.corcoran@est.tech> Issue-ID: DMAAP-1425
Diffstat (limited to 'jjb/dmaap')
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml24
1 files changed, 21 insertions, 3 deletions
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 0aab36fbd..ffd5a2d8e 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,5 +1,5 @@
- project:
- name: dmaap-datarouter
+ name: dmaap-datarouter-java11
project-name: 'dmaap-datarouter'
jobs:
- '{project-name}-{stream}-verify-java'
@@ -11,11 +11,29 @@
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
-
project: 'dmaap/datarouter'
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'dmaap-datarouter-settings'
+ files: '**'
+ archive-artifacts: ''
+ java-version: openjdk11
+
+
+- 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'
- 'elalto':
@@ -23,7 +41,7 @@
mvn-settings: 'dmaap-datarouter-settings'
files: '**'
archive-artifacts: ''
- java-version: openjdk11
+ java-version: openjdk8
- project:
name: dmaap-datarouter-sonar