Add JDK 17 in nodes used in jenkins verify jobs in ONAP & O-RAN-SC

Signed-off-by: JohnKeeney <john.keeney@est.tech>
Issue-ID: CCSDK-3813
Change-Id: I444a4fe1349a84445839f6cf8efbb6538333269c

diff --git a/infra/jenkins/slave-setup/nordix-onap-jenkins-build-server/configure-image.sh b/infra/jenkins/slave-setup/nordix-onap-jenkins-build-server/configure-image.sh
index fbcf1dcf0d2ba20746c3c83d666089cdefc89517..0beee43e77ad57723246fe952620ee6be8b3f657 100644 (file)
--- a/infra/jenkins/slave-setup/nordix-onap-jenkins-build-server/configure-image.sh
+++ b/infra/jenkins/slave-setup/nordix-onap-jenkins-build-server/configure-image.sh
@@ -99,7 +99,8 @@ sudo add-apt-repository -y ppa:openjdk-r/ppa
 sudo apt-get update
 sudo -H -E apt -y -q=3 install \
     openjdk-11-jdk \
-    openjdk-12-jdk
+    openjdk-12-jdk \
+    openjdk-17-jdk
 # set java 11 as default version
 sudo update-java-alternatives -s java-1.11.0-openjdk-amd64
 java -version

diff --git a/infra/jenkins/slave-setup/oransc-build-server/configure-image.sh b/infra/jenkins/slave-setup/oransc-build-server/configure-image.sh
index 66d2e54cd9f3fb057aa3e1f4ce8357ff320246e7..dc0239a84e3a6d8d9ba9315d13b20d6e3dbf5ca3 100644 (file)
--- a/infra/jenkins/slave-setup/oransc-build-server/configure-image.sh
+++ b/infra/jenkins/slave-setup/oransc-build-server/configure-image.sh
@@ -28,7 +28,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y upgrade
 sudo apt-get install -y unzip
 
 # INSTALL JAVA
-sudo apt-get install -y openjdk-11-jdk
+sudo apt-get install -y openjdk-11-jdk openjdk-17-jdk 
 java -version
 
 # INSTALL DOCKER