Updated OKE Jenkins runs to k8s 1.25.4 and Istio 1.16.1 (#3896)

* Updated OKE Jenkins runs to k8s 1.25.4 and Istio 1.16.1

Author: marinakog

Jenkinsfile.oke

@@ -5,7 +5,7 @@
 pipeline {
     agent { label 'VM.Standard2.8' }
     options {
-        timeout(time: 1200, unit: 'MINUTES')
+        timeout(time: 1800, unit: 'MINUTES')
         disableConcurrentBuilds()
     }
 
@@ -46,7 +46,7 @@ pipeline {
         start_time = sh(script: 'date +"%Y-%m-%d %H:%M:%S"', returnStdout: true).trim()
         wle_download_url="https://github.com/oracle/weblogic-logging-exporter/releases/latest"
 
-        CLUSTER_NAME = "${env.JOB_NAME == 'wko-oke-nightly-parallel' ? 'mtcluster' : 'mkcluster'}"
+        CLUSTER_NAME = "${env.JOB_NAME == 'wko-oke-nightly-parallel' ? 'parcluster' : 'seqcluster'}"
         kubeconfig_file = "${WORKSPACE}/terraform/${CLUSTER_NAME}_kubeconfig"
         MAVEN_PROFILE_NAME = "${env.JOB_NAME == 'wko-oke-nightly-parallel' ? 'oke-parallel' : 'oke-sequential'}"
         availability_domain = "${env.JOB_NAME == 'wko-oke-nightly-parallel' ? 'VPGL:PHX-AD-1' : 'VPGL:PHX-AD-2'}"
@@ -62,25 +62,25 @@ pipeline {
 
         string(name: 'KUBE_VERSION',
                description: 'kube version for oke cluster',
-               defaultValue: '1.24.1'
+               defaultValue: '1.25.4'
         )
         string(name: 'IMAGE_ID',
                        description: 'oci image id for node pool, find image OCID for your region from https://docs.oracle.com/iaas/images/',
-                       defaultValue: 'ocid1.image.oc1.phx.aaaaaaaa6med26u7lkdeyz6mjwaepakor5bp2y24lwr4x6adn6izidipbbsa'
-                       //8.0defaultValue: 'ocid1.image.oc1.phx.aaaaaaaan7lpv4nxnx4r772csco2nzre3owzqdebf75ty6mlbp562vn6c45q'
+                       defaultValue: 'ocid1.image.oc1.phx.aaaaaaaancucg25pze6m52agxwxmmfszvsdnhp3kvim53pts2tw6mik4xtha'
+                       //8.0defaultValue: 'ocid1.image.oc1.phx.aaaaaaaancq36l7q4fqwznqhnp626wuekkq7twk2em5ysyd65bd4xho72tmq'
 
                 )
         string(name: 'KUBECTL_VERSION',
                        description: 'kubectl version',
-                       defaultValue: '1.24.8'
+                       defaultValue: '1.25.4'
                 )
         string(name: 'HELM_VERSION',
                description: 'Helm version',
                defaultValue: '3.10.2'
         )
         string(name: 'ISTIO_VERSION',
                description: 'Other Possible Values 1.7.3, 1.8.1, 1.7.6',
-               defaultValue: '1.10.4'
+               defaultValue: '1.16.1'
         )
 
         string(name: 'NUMBER_OF_THREADS',
@@ -141,11 +141,11 @@ pipeline {
         )
         string(name: 'PROMETHEUS_CHART_VERSION',
                description: '',
-               defaultValue: '15.2.0'
+               defaultValue: '17.0.0'
         )
         string(name: 'GRAFANA_CHART_VERSION',
                description: '',
-               defaultValue: '6.38.6'
+               defaultValue: '6.44.11'
         )
         booleanParam(name: 'COLLECT_LOGS_ON_SUCCESS',
                      description: 'Collect logs for successful runs. Default is false.',
@@ -228,7 +228,7 @@ pipeline {
 
                         export OKE_CLUSTER="true"
                         if [ ${MAVEN_PROFILE_NAME} = 'oke-parallel' ]; then
-                           VCN_CIDR_PREFIX="10.1"
+                           VCN_CIDR_PREFIX="10.4"
                         else
                            VCN_CIDR_PREFIX="10.3"
                         fi

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorFmwUpgrade.java

@@ -94,7 +94,6 @@
  */
 @DisplayName("Tests to upgrade Operator with FMW domain in PV using WLST")
 @IntegrationTest
-@Tag("oke-sequential")
 @Tag("kind-sequential")
 class ItOperatorFmwUpgrade {
 
@@ -224,6 +223,7 @@ void testOperatorFmwUpgradeFrom344ToCurrent() {
   /**
    * Operator upgrade from 4.0.3 to current with a FMW Domain.
    */
+  @Tag("oke-sequential")
   @Test
   @DisplayName("Upgrade Operator from 4.0.3 to current")
   void testOperatorFmwUpgradeFrom403ToCurrent() {
@@ -233,6 +233,7 @@ void testOperatorFmwUpgradeFrom403ToCurrent() {
   /**
    * Operator upgrade from 4.0.4 to current with a FMW Domain.
    */
+  @Tag("oke-sequential")
   @Test
   @DisplayName("Upgrade Operator from 4.0.4 to current")
   void testOperatorFmwUpgradeFrom404ToCurrent() {

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorUpgradeWithIstio.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -70,7 +70,6 @@
  */
 @DisplayName("Operator upgrade tests with Istio")
 @IntegrationTest
-@Tag("oke-sequential")
 @Tag("kind-sequential")
 class ItOperatorUpgradeWithIstio {
 

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorWlsUpgrade.java

@@ -120,7 +120,6 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @DisplayName("Operator upgrade tests")
 @IntegrationTest
-@Tag("oke-sequential")
 @Tag("kind-sequential")
 class ItOperatorWlsUpgrade {
 
@@ -200,6 +199,7 @@ void testOperatorWlsUpgradeFrom344ToCurrent(String domainType) {
   /**
    * Operator upgrade from 4.0.3 to current.
    */
+  @Tag("oke-sequential")
   @ParameterizedTest
   @DisplayName("Upgrade Operator from 4.0.3 to current")
   @ValueSource(strings = { "Image", "FromModel" })
@@ -211,6 +211,7 @@ void testOperatorWlsUpgradeFrom403ToCurrent(String domainType) {
   /**
    * Operator upgrade from 4.0.4 to current.
    */
+  @Tag("oke-sequential")
   @ParameterizedTest
   @DisplayName("Upgrade Operator from 4.0.4 to current")
   @ValueSource(strings = { "Image", "FromModel" })

kindversions.properties

@@ -77,6 +77,7 @@
 0.16.0_1.20.15=kindest/node:v1.20.15@sha256:45d0194a8069c46483a0e509088ab9249302af561ebee76a1281a1f08ecb4ed3
 0.17.0_1.25=kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1
 0.17.0_1.25.3=kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1
+0.17.0_1.25.4=kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1
 0.17.0_1.24=kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
 0.17.0_1.24.7=kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
 0.17.0_1.23=kindest/node:v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61
@@ -86,4 +87,4 @@
 0.17.0_1.21=kindest/node:v1.21.14@sha256:9d9eb5fb26b4fbc0c6d95fa8c790414f9750dd583f5d7cee45d92e8c26670aa1
 0.17.0_1.21.14=kindest/node:v1.21.14@sha256:9d9eb5fb26b4fbc0c6d95fa8c790414f9750dd583f5d7cee45d92e8c26670aa1
 0.17.0_1.20=kindest/node:v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394
-0.17.0_1.20.15=kindest/node:v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394
+0.17.0_1.20.15=kindest/node:v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394