From 29d54119d172c70c9f47f8b38555baf88515dc66 Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Thu, 2 Mar 2023 13:11:44 +0000 Subject: [PATCH] NONRTRIC: Try use jdk17 in jenkins jobs for nonrtric & nonrtric-plt-dmaapadapter Change-Id: Ic07b61e68aa14432fc51bc10b962dff3177ac81c Signed-off-by: JohnKeeney Issue-ID: NONRTRIC-841 Signed-off-by: JohnKeeney --- jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml | 6 +++++- jjb/nonrtric/nonrtric.yaml | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml index 6dc595a0..21be3cd6 100644 --- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml +++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml @@ -22,7 +22,7 @@ # maven settings file has docker credentials mvn-settings: nonrtric-plt-dmaapadapter-settings mvn-version: mvn36 - java-version: openjdk11 + java-version: openjdk17 - project: <<: *dmaapadapter_jdk_common @@ -35,8 +35,10 @@ - master: branch: master - f-release: + java-version: openjdk11 branch: f-release - g-release: + java-version: openjdk11 branch: g-release # nonrtric:dmaapadapter/ @@ -54,8 +56,10 @@ - master: branch: master - f-release: + java-version: openjdk11 branch: f-release - g-release: + java-version: openjdk11 branch: g-release - project: diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index f350d35f..f1769e03 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -22,7 +22,7 @@ # maven settings file has docker credentials mvn-settings: nonrtric-settings mvn-version: mvn36 - java-version: openjdk11 + java-version: openjdk17 # nonrtric:pm-pmlogger-influx # Maven artifacts for nonrtric:pm-pmlogger-influx @@ -206,9 +206,13 @@ - "{project-name}-gerrit-docker-jobs" - gerrit-go-verify stream: - - all: - branch: '*' + - master: + branch: master + - f-release: + java-version: openjdk11 + branch: f-release - g-release: + java-version: openjdk11 branch: g-release - project: -- 2.16.6