Refactor!: Update JJB code to comply with 5.x

[ci-management.git] / jjb / portal-nonrtric-controlpanel / portal-nonrtric-controlpanel.yaml

diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index 1c9b831..0181138 100644 (file)
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- portal_nonrtric_controlpanel_common: &portal_nonrtric_controlpanel_common
+- _portal_nonrtric_controlpanel_common: &portal_nonrtric_controlpanel_common
     # values apply to all projects here
     name: portal-nonrtric-controlpanel-common
     # git repo
@@ -23,7 +23,7 @@
     # maven settings file has docker credentials
     mvn-settings: portal-nonrtric-controlpanel-settings
     # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: mvn36
     sonarcloud-project-key: "portal-nonrtric-controlpanel"
     sonarcloud-project-organization: "o-ran-sc"
@@ -52,10 +52,9 @@
     stream:
       - master:
           branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -111,10 +110,9 @@
     stream:
       - master:
           branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -134,8 +132,6 @@
     stream:
       - master:
           branch: master
-      - dawn:
-          branch: dawn
-      - e-release:
-          branch: e-release
-
+      - g-release:
+          java-version: openjdk11
+          branch: g-release