Merge branch 'xc-122680' into 'main'

backport MR 4840 to main See merge request weblogic-cloud/weblogic-kubernetes-operator!4841
oracle · Oct 18, 2024 · 62a1704 · 62a1704
2 parents 7467812 + 112236e
commit 62a1704
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...ration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java b/...ration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java
@@ -240,7 +240,7 @@ public void beforeAll(ExtensionContext context) {
 
         logger.info("Build/Check wdt-basic image with tag {0}", WDT_BASIC_IMAGE_TAG);
         // build WDT basic image if does not exits
-        if (! imageExists(WDT_BASIC_IMAGE_NAME, WDT_BASIC_IMAGE_TAG)) {
+        if (!imageExists(WDT_BASIC_IMAGE_NAME, WDT_BASIC_IMAGE_TAG) && !CRIO && !OCNE) {
           logger.info("Building wdt-basic image {0}", wdtBasicImage);
           testUntil(
                 withVeryLongRetryPolicy,
@@ -249,7 +249,7 @@ public void beforeAll(ExtensionContext context) {
                 logger,
                 "createBasicImage to be successful");
         } else {
-          logger.info("!!!! domain image {0} exists !!!!", wdtBasicImage);
+          logger.info("!!!! domain image {0} exists !!!! or env is not OCNE based", wdtBasicImage);
         }
 
         /* Check image exists using WLSIMG_BUILDER images | grep image tag.
@@ -261,8 +261,10 @@ public void beforeAll(ExtensionContext context) {
         assertTrue(doesImageExist(MII_BASIC_IMAGE_TAG),
               String.format("Image %s doesn't exist", miiBasicImage));
 
-        assertTrue(doesImageExist(WDT_BASIC_IMAGE_TAG),
+        if (!CRIO && !OCNE) {
+          assertTrue(doesImageExist(WDT_BASIC_IMAGE_TAG),
               String.format("Image %s doesn't exist", wdtBasicImage));
+        }
 
         logger.info(WLSIMG_BUILDER + " login");
         testUntil(withVeryLongRetryPolicy,
@@ -280,7 +282,9 @@ public void beforeAll(ExtensionContext context) {
           // add images only if SKIP_BUILD_IMAGES_IF_EXISTS is not set
           if (!SKIP_BUILD_IMAGES_IF_EXISTS) {
             images.add(miiBasicImage);
-            images.add(wdtBasicImage);
+            if (!CRIO && !OCNE) {
+              images.add(wdtBasicImage);
+            }
           }
 
           for (String image : images) {