Merge branch 'fmwsamplefix' into 'release/4.2'

Fix FMW sample nightly failure ItFmwDomainOnPVSample

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

Author: rjeberhard

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

@@ -45,6 +45,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_REGISTRY;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_INGRESS_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_RELEASE_NAME;
+import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_DOWNLOAD_URL;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_DOWNLOAD_URL;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WIT_JAVA_HOME;
@@ -135,12 +136,9 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
     envMap.put("OKD", "" +  OKD);
     envMap.put("KIND_CLUSTER", "" + KIND_CLUSTER);
     envMap.put("OCNE", "" + OCNE);
-
-    if (OCNE) {
-      envMap.put("OPER_IMAGE_NAME", TEST_IMAGES_PREFIX + IMAGE_NAME_OPERATOR);
-      envMap.put("DOMAIN_CREATION_IMAGE_NAME", TEST_IMAGES_PREFIX + DOMAIN_CREATION_IMAGE_NAME);
-      envMap.put("DB_IMAGE_PULL_SECRET", BASE_IMAGES_REPO_SECRET_NAME);
-    }
+    envMap.put("OPER_IMAGE_NAME", TEST_IMAGES_PREFIX + IMAGE_NAME_OPERATOR);
+    envMap.put("DOMAIN_CREATION_IMAGE_NAME", TEST_IMAGES_PREFIX + DOMAIN_CREATION_IMAGE_NAME);
+    envMap.put("DB_IMAGE_PULL_SECRET", BASE_IMAGES_REPO_SECRET_NAME);
 
     // kind cluster uses openjdk which is not supported by image tool
     if (WIT_JAVA_HOME != null) {
@@ -228,18 +226,19 @@ public void testInitialImage() {
     imagePull(BUSYBOX_IMAGE + ":" + BUSYBOX_TAG);
     imageTag(BUSYBOX_IMAGE + ":" + BUSYBOX_TAG, "busybox");
     execTestScriptAndAssertSuccess("-initial-image", "Failed to run -initial-image");
+    ExecResult result = Command.withParams(
+        new CommandParams()
+            .command(WLSIMG_BUILDER + " images")
+            .env(envMap)
+            .redirect(true)
+    ).executeAndReturnResult();
+    logger.info(result.stdout());
 
     // load the image to kind if using kind cluster
     String imageCreated;
-    if (KIND_REPO != null) {
-      imageCreated = DOMAIN_CREATION_IMAGE_NAME + ":" + DOMAIN_CREATION_IMAGE_JRF_TAG;
-      logger.info("loading image {0} to kind", imageCreated);
-      imagePush(imageCreated);
-    } else if (OCNE) {
-      imageCreated = TEST_IMAGES_PREFIX + DOMAIN_CREATION_IMAGE_NAME + ":" + DOMAIN_CREATION_IMAGE_JRF_TAG;
-      logger.info("pushing image {0} to repo", imageCreated);
-      imagePush(imageCreated);
-    }
+    imageCreated = TEST_IMAGES_PREFIX + DOMAIN_CREATION_IMAGE_NAME + ":" + DOMAIN_CREATION_IMAGE_JRF_TAG;
+    logger.info("pushing image {0} to repo", imageCreated);
+    imagePush(imageCreated);
   }
 
   /**

kubernetes/samples/scripts/create-oracle-db-service/common/oracle.db.yaml

@@ -64,10 +64,8 @@ spec:
           limits:
             cpu: "2"
             memory: "6Gi"
-            ephemeral-storage: "8Gi"
           requests:
             cpu: 500m
-            ephemeral-storage: "6Gi"
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
       dnsPolicy: ClusterFirst

operator/integration-tests/domain-on-pv/run-test.sh

@@ -393,8 +393,6 @@ if [ "$DO_INITIAL_MAIN" = "true" ]; then
     testapp internal cluster-1 "Hello World!"
     if [ "$OKD" = "true" ]; then
       testapp OKD  cluster-1 "Hello World!" 
-    else
-      testapp traefik  cluster-1 "Hello World!"
     fi
   fi