From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 7 Mar 2023 20:51:18 +0000 (+0000)
Subject: Merge "NONRTRIC: Try use jdk17 in jenkins jobs for nonrtric & nonrtric-plt-dmaapadapter"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=3157692ac0d72945fb6e39b5cf0914701481e834;hp=e3fc20e44067b93bea3f90c642652854434722ea;p=ci-management.git

Merge "NONRTRIC: Try use jdk17 in jenkins jobs for nonrtric & nonrtric-plt-dmaapadapter"
---

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: