From 31f9173023e67326d2399104f166b98a81037a5b Mon Sep 17 00:00:00 2001 From: JohnKeeney Date: Thu, 23 Mar 2023 15:05:14 +0000 Subject: [PATCH] nonrtric: updates some jobs to JDK17 Update java based jobs for: nonrtric-plt-helmmanager nonrtric-plt-rappcatalogue portal-nonrtric-controlpanel Also remove some very old jobs. Change-Id: I9fea0ee94604a0be9171f6b70680d61d2f0b4f04 Signed-off-by: JohnKeeney Issue-ID: NONRTRIC-841 --- .../nonrtric-plt-helmmanager.yaml | 6 +++++- .../nonrtric-plt-rappcatalogue.yaml | 6 +++++- .../portal-nonrtric-controlpanel.yaml | 17 ++++------------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml index 631c5b09..ae042ee8 100644 --- a/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml +++ b/jjb/nonrtric-plt-helmmanager/nonrtric-plt-helmmanager.yaml @@ -22,7 +22,7 @@ # maven settings file has docker credentials mvn-settings: nonrtric-plt-helmmanager-settings mvn-version: mvn36 - java-version: openjdk11 + java-version: openjdk17 - project: <<: *helmmanager_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:helmmanager @@ -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-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml index 1008f6ea..2e194f1e 100644 --- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml +++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml @@ -22,7 +22,7 @@ # maven settings file has docker credentials mvn-settings: nonrtric-plt-rappcatalogue-settings mvn-version: mvn36 - java-version: openjdk11 + java-version: openjdk17 - project: <<: *rappcatalogue_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:rappcatalogue @@ -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/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml index efabbb2f..25863bbd 100644 --- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml +++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml @@ -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,11 +52,8 @@ stream: - master: branch: master - - dawn: - branch: dawn - - e-release: - branch: e-release - g-release: + java-version: openjdk11 branch: g-release - project: @@ -113,11 +110,8 @@ stream: - master: branch: master - - dawn: - branch: dawn - - e-release: - branch: e-release - g-release: + java-version: openjdk11 branch: g-release - project: @@ -138,10 +132,7 @@ stream: - master: branch: master - - dawn: - branch: dawn - - e-release: - branch: e-release - g-release: + java-version: openjdk11 branch: g-release -- 2.16.6