Merge branch 'mii-upgrade' into 'main'

Modify the tag for welogic 14.1.2.0.0 image

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

Author: rjeberhard

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

@@ -130,7 +130,8 @@ class ItMiiDomainUpgradeToSecureMode {
   String clusterIngressHost;
   private final String imageTag1411 = "14.1.1.0-11";
   private final String imageTag12214 = "12.2.1.4";
-  private final String image1412 = "wls-docker-dev-local.dockerhub-phx.oci.oraclecorp.com/weblogic:14.1.2.0.0";
+  private final String imageTag1412 = "14.1.2.0.0-jdk17";
+  private final String image1412 = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag1412;
   private final String sampleAppUri = "/sample-war/index.jsp";
   private final String adminAppUri = "/management/tenant-monitoring/servers";
   private final String adminAppText = "RUNNING";

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonTestUtils.java

@@ -2047,7 +2047,7 @@ public static String getKindRepoValue(String propertyName) {
 
   /**
    * Given a repo and tenancy name, determine the prefix length.  For example,
-   * phx.ocir.io/foobar/test-images/myimage will treat phx.ocir.io/foobar/ as
+   * cloud.io/foobar/test-images/myimage will treat cloud.io/foobar/ as
    * the prefix so the length is 19.
    *
    * @param baseRepo    base repo name
@@ -2465,4 +2465,4 @@ public static void createIngressPathRouting(String namespace, String path,
     getLogger().info("ingress {0} was created in namespace {1}", ingressName, namespace);
   }
 
-}
+}

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/IstioUtils.java

@@ -28,6 +28,8 @@
 import oracle.weblogic.kubernetes.utils.SemanticVersion.Compatibility;
 
 import static oracle.weblogic.kubernetes.TestConstants.ARM;
+import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO;
+import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_TENANCY;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
 import static oracle.weblogic.kubernetes.TestConstants.FAILURE_RETRY_INTERVAL_SECONDS;
 import static oracle.weblogic.kubernetes.TestConstants.FAILURE_RETRY_LIMIT_MINUTES;
@@ -89,11 +91,12 @@ public static void installIstio() {
     Path istioInstallPath =
         Paths.get(RESULTS_ROOT, "install-istio.sh");
     String installScript = istioInstallPath.toString();
-
-    // When install istio in OCNE environment, use phx.ocir.io/devweblogic/istio-release instead of gcr.io/istio-release
+    String ocneIstioRepo = BASE_IMAGES_REPO + "/" +  BASE_IMAGES_TENANCY; 
+    // When install istio in OCNE environment, 
+    // use BASE_IMAGES_REPO/devweblogic/istio-release instead of gcr.io/istio-release
     if (OCNE) {
-      logger.info("replace istio installation hub in File {0}", installScript);
-      assertDoesNotThrow(() -> replaceStringInFile(installScript, "gcr.io", "phx.ocir.io/devweblogic"),
+      logger.info("replace istio installation hub in File {0}", ocneIstioRepo);
+      assertDoesNotThrow(() -> replaceStringInFile(installScript, "gcr.io", ocneIstioRepo),
           String.format("Failed to replace string in File %s", installScript));
     }
     String arch = "linux-amd64";