Merge branch 'xc-116317' into 'main'

Do not install Istio in crio-pipeline

See merge request weblogic-cloud/weblogic-kubernetes-operator!4613

Author: rjeberhard

integration-tests/pom.xml

@@ -55,6 +55,7 @@
         <wko.it.fss.dir>${env.FSS_DIR}</wko.it.fss.dir>
         <wko.it.okd.cluster>${env.OKD}</wko.it.okd.cluster>
         <wko.it.ocne.cluster>${env.OCNE}</wko.it.ocne.cluster>
+        <wko.it.crio.pipeline>${env.CRIO_PIPELINE}</wko.it.crio.pipeline>
         <wko.it.oracle.db.operator.release>${env.ORACLE_DB_OPERATOR_RELEASE}</wko.it.oracle.db.operator.release>
         <wko.it.oraclelinux.test.version>${env.ORACLELINUX_TEST_VERSION}</wko.it.oraclelinux.test.version>
         <wko.it.wdt.download.url>${wdt.download.url}</wko.it.wdt.download.url>
@@ -254,12 +255,13 @@
                                 <wko.it.grafana.chart.version>${wko.it.grafana.chart.version}</wko.it.grafana.chart.version>
                                 <wko.it.istio.version>${wko.it.istio.version}</wko.it.istio.version>
                                 <wko.it.oke.cluster>${wko.it.oke.cluster}</wko.it.oke.cluster>
-        			<wko.it.oke.cluster.privateip>${env.OKE_CLUSTER_PRIVATEIP}</wko.it.oke.cluster.privateip>
+        			            <wko.it.oke.cluster.privateip>${env.OKE_CLUSTER_PRIVATEIP}</wko.it.oke.cluster.privateip>
                                 <wko.it.nfs.server>${wko.it.nfs.server}</wko.it.nfs.server>
                                 <wko.it.fss.dir>${wko.it.fss.dir}</wko.it.fss.dir>
                                 <wko.it.okd.cluster>${wko.it.okd.cluster}</wko.it.okd.cluster>
                                 <wko.it.arm.cluster>${wko.it.arm.cluster}</wko.it.arm.cluster>
                                 <wko.it.ocne.cluster>${wko.it.ocne.cluster}</wko.it.ocne.cluster>
+                                <wko.it.crio.pipeline>${wko.it.crio.pipeline}</wko.it.crio.pipeline>
                                 <wko.it.oracle.db.operator.release>${wko.it.oracle.db.operator.release}</wko.it.oracle.db.operator.release>
                                 <wko.it.oraclelinux.test.version>${wko.it.oraclelinux.test.version}</wko.it.oraclelinux.test.version>
                                 <wko.it.wdt.download.url>${wko.it.wdt.download.url}</wko.it.wdt.download.url>

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

@@ -89,7 +89,6 @@
 @Tag("kind-parallel")
 @Tag("olcne-srg")
 @Tag("oke-parallelnew")
-
 class ItIstioMiiDomain {
 
   private static String opNamespace = null;
@@ -155,7 +154,6 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
   @Test
   @DisplayName("Create WebLogic Domain with mii model with istio")
   @Tag("gate")
-  @Tag("crio")
   void testIstioModelInImageDomain() throws UnknownHostException, IOException, InterruptedException {
 
     // Create the repo secret to pull the image

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

@@ -380,6 +380,9 @@ public interface TestConstants {
   // OCNE constants
   public static final boolean OCNE =
       Boolean.parseBoolean(getNonEmptySystemProperty("wko.it.ocne.cluster", "false"));
+  // CRIO_PIPELINE constants
+  public static final boolean CRIO =
+      Boolean.parseBoolean(getNonEmptySystemProperty("wko.it.crio.pipeline", "false"));
 
   // default name suffixes
   public String DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX = "-ext";

integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java

@@ -48,6 +48,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_USERNAME;
 import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_TENANCY;
 import static oracle.weblogic.kubernetes.TestConstants.CERT_MANAGER;
+import static oracle.weblogic.kubernetes.TestConstants.CRIO;
 import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_REPO;
@@ -316,7 +317,8 @@ public void beforeAll(ExtensionContext context) {
 
         // set initialization success to true, not counting the istio installation as not all tests use istio
         isInitializationSuccessful = true;
-        if ((!OKD && !OCNE) || (OCNE && !assertDoesNotThrow(() -> Namespace.exists("istio-system")))) {
+        if ((!OKD && !OCNE && !CRIO)
+            || (OCNE && !CRIO && !assertDoesNotThrow(() -> Namespace.exists("istio-system")))) {
           logger.info("Installing istio before any test suites are run");
           installIstio();
         }
@@ -360,11 +362,11 @@ public void close() {
     if (SKIP_CLEANUP) {
       logger.info("Skipping RESULTS_ROOT clean up after test execution");
     } else {
-      if (!OKD && !OCNE) {
+      if (!OKD && !OCNE && !CRIO) {
         logger.info("Uninstall istio after all test suites are run");
         uninstallIstio();
       }
-      if (!OKD && !OKE_CLUSTER && !OCNE) {
+      if (!OKD && !OKE_CLUSTER && !OCNE && !CRIO) {
         logger.info("Delete istio-system namespace after all test suites are run");
         deleteNamespace("istio-system");
       }