Merge branch 'fixwlsmii' into 'release/4.2'

rjeberhard · rjeberhard · commit ee1a28fce0d7 · 2025-05-15T17:33:48.000Z
OWLS-128825 - ItWlsMiiLegacySample.testUpate4, ItWlsMiiSample.testUpate4 failed due run-test.sh does not check pod readiness before comparing

See merge request weblogic-cloud/weblogic-kubernetes-operator!4966
diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItWlsMiiSample.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItWlsMiiSample.java
@@ -31,6 +31,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
 import static oracle.weblogic.kubernetes.TestConstants.KIND_CLUSTER;
 import static oracle.weblogic.kubernetes.TestConstants.KIND_REPO;
+import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
 import static oracle.weblogic.kubernetes.TestConstants.OKD;
 import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
 import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
@@ -87,7 +88,6 @@ class ItWlsMiiSample {
   @BeforeAll
   public static void initAll(@Namespaces(3) List<String> namespaces) {
     logger = getLogger();
-
     // get a new unique opNamespace
     logger.info("Creating unique namespace for Operator");
     assertNotNull(namespaces.get(0), "Namespace list is null");
@@ -101,42 +101,37 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
     assertNotNull(namespaces.get(2), "Namespace list is null");
     traefikNamespace = namespaces.get(2);
 
-    String miiSampleWorkDir =
-        RESULTS_ROOT + "/" + domainNamespace + "/model-in-image-sample-work-dir";
+    String miiSampleWorkDir = RESULTS_ROOT + "/" + domainNamespace + "/model-in-image-sample-work-dir";
 
-    // env variables to override default values in sample scripts
     envMap = new HashMap<>();
     envMap.put("OPER_NAMESPACE", opNamespace);
     envMap.put("DOMAIN_NAMESPACE", domainNamespace);
     envMap.put("DOMAIN_UID1", getUniqueName("sample-domain1-"));
     envMap.put("DOMAIN_UID2", getUniqueName("sample-domain2-"));
     envMap.put("TRAEFIK_NAMESPACE", traefikNamespace);
-    envMap.put("TRAEFIK_HTTP_NODEPORT", "0"); // 0-->dynamically choose the np
-    envMap.put("TRAEFIK_HTTPS_NODEPORT", "0"); // 0-->dynamically choose the np
+    envMap.put("TRAEFIK_HTTP_NODEPORT", "0");// 0-->dynamically choose the np
+    envMap.put("TRAEFIK_HTTPS_NODEPORT", "0");// 0-->dynamically choose the np
     envMap.put("TRAEFIK_NAME", TRAEFIK_RELEASE_NAME + "-" + traefikNamespace.substring(3));
     envMap.put("TRAEFIK_IMAGE_REGISTRY", TRAEFIK_INGRESS_IMAGE_REGISTRY);
     envMap.put("TRAEFIK_IMAGE_REPOSITORY", TRAEFIK_INGRESS_IMAGE_NAME);
     envMap.put("TRAEFIK_IMAGE_TAG", TRAEFIK_INGRESS_IMAGE_TAG);
     envMap.put("WORKDIR", miiSampleWorkDir);
-    envMap.put("BASE_IMAGE_NAME", WEBLOGIC_IMAGE_TO_USE_IN_SPEC
-        .substring(0, WEBLOGIC_IMAGE_TO_USE_IN_SPEC.lastIndexOf(":")));
+    envMap.put("BASE_IMAGE_NAME", WEBLOGIC_IMAGE_TO_USE_IN_SPEC.substring(0,
+        WEBLOGIC_IMAGE_TO_USE_IN_SPEC.lastIndexOf(":")));
     envMap.put("BASE_IMAGE_TAG", WEBLOGIC_IMAGE_TAG);
     envMap.put("IMAGE_PULL_SECRET_NAME", BASE_IMAGES_REPO_SECRET_NAME);
     envMap.put("DOMAIN_IMAGE_PULL_SECRET_NAME", TEST_IMAGES_REPO_SECRET_NAME);
     envMap.put("WLSIMG_BUILDER_DEFAULT", WLSIMG_BUILDER_DEFAULT);
     envMap.put("WLSIMG_BUILDER", WLSIMG_BUILDER);
-    envMap.put("OKD", "" +  OKD);
-    envMap.put("KIND_CLUSTER", "" + KIND_CLUSTER);
+    envMap.put("OKD", String.valueOf(OKD));
+    envMap.put("KIND_CLUSTER", String.valueOf(KIND_CLUSTER));
 
-    // kind cluster uses openjdk which is not supported by image tool
     if (WIT_JAVA_HOME != null) {
       envMap.put("JAVA_HOME", WIT_JAVA_HOME);
     }
-
     if (WIT_DOWNLOAD_URL != null) {
       envMap.put("WIT_INSTALLER_URL", WIT_DOWNLOAD_URL);
     }
-
     if (WDT_DOWNLOAD_URL != null) {
       envMap.put("WDT_INSTALLER_URL", WDT_DOWNLOAD_URL);
     }
@@ -146,23 +141,16 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
       envMap.put("OPER_IMAGE_NAME", "localhost/weblogic-kubernetes-operator");
       envMap.put("MODEL_IMAGE_NAME", DOMAIN_CREATION_IMAGE_NAME);
       envMap.put("K8S_NODEPORT_HOST", assertDoesNotThrow(() -> InetAddress.getLocalHost().getHostAddress()));
-      envMap.put("TRAEFIK_INGRESS_HTTP_HOSTPORT", "" + TRAEFIK_INGRESS_HTTP_HOSTPORT);
-      envMap.put("TRAEFIK_NAMESPACE", TRAEFIK_NAMESPACE);
+      envMap.put("TRAEFIK_INGRESS_HTTP_HOSTPORT", String.valueOf(TRAEFIK_INGRESS_HTTP_HOSTPORT));
     } else {
-      envMap.put("TRAEFIK_NAMESPACE", traefikNamespace);
       envMap.put("K8S_NODEPORT_HOST", K8S_NODEPORT_HOST);
     }
-    
+
     logger.info("Environment variables to the script {0}", envMap);
 
-    logger.info("Setting up image registry secrets");
-    // Create the repo secret to pull the domain image
-    // this secret is used only for non-kind cluster
     createTestRepoSecret(domainNamespace);
     logger.info("Registry secret {0} created for domain image successfully in namespace {1}",
         TEST_IMAGES_REPO_SECRET_NAME, domainNamespace);
-    // Create the repo secret to pull the base image
-    // this secret is used only for non-kind cluster
     createBaseRepoSecret(domainNamespace);
     logger.info("Registry secret {0} for base image created successfully in namespace {1}",
         BASE_IMAGES_REPO_SECRET_NAME, domainNamespace);
@@ -274,39 +262,63 @@ public void testUpate4() {
    * @param arg arguments to execute script
    * @param errString a string of detailed error
    */
-  private void execTestScriptAndAssertSuccess(String arg,
-                                              String errString) {
-
+  private void execTestScriptAndAssertSuccess(String arg, String errString) {
     Assumptions.assumeTrue(previousTestSuccessful);
     previousTestSuccessful = false;
 
-    String command = miiSampleScript
-        + " "
-        + arg;
-
-    ExecResult result = Command.withParams(
-        new CommandParams()
-            .command(command)
-            .env(envMap)
-            .redirect(true)
-    ).executeAndReturnResult();
+    Map<String, String> podSnapshotBefore = null;
+    if ("-update4".equals(arg)) {
+      podSnapshotBefore = getPodTimestamps(envMap.get("DOMAIN_NAMESPACE"));
+    }
 
-    boolean success =
-        result != null
-            && result.exitValue() == 0
-            && result.stdout() != null
-            && result.stdout().contains("Finished without errors");
+    String command = miiSampleScript + " " + arg;
+    ExecResult result = Command.withParams(new CommandParams().command(command)
+        .env(envMap).redirect(true)).executeAndReturnResult();
+
+    boolean success = result != null && result.exitValue() == 0 && result.stdout() != null
+        && result.stdout().contains("Finished without errors");
+
+    if (success && "-update4".equals(arg)) {
+      Map<String, String> podSnapshotAfter = getPodTimestamps(envMap.get("DOMAIN_NAMESPACE"));
+      for (Map.Entry<String, String> entry : podSnapshotBefore.entrySet()) {
+        String pod = entry.getKey();
+        String beforeTime = entry.getValue();
+        String afterTime = podSnapshotAfter.get(pod);
+        if (afterTime != null && !beforeTime.equals(afterTime)) {
+          success = false;
+          logger.severe("Unexpected pod restart detected for pod "
+              + pod + ": before=" + beforeTime + " after=" + afterTime);
+        }
+      }
+    }
 
-    String outStr = errString;
-    outStr += ", command=\n{\n" + command + "\n}\n";
-    outStr += ", stderr=\n{\n" + (result != null ? result.stderr() : "") + "\n}\n";
-    outStr += ", stdout=\n{\n" + (result != null ? result.stdout() : "") + "\n}\n";
+    String outStr = errString + ", command=\n{\n" + command + "\n}\n"
+        + ", stderr=\n{\n" + (result != null ? result.stderr() : "") + "\n}\n"
+        + ", stdout=\n{\n" + (result != null ? result.stdout() : "") + "\n}\n";
 
     assertTrue(success, outStr);
-
     previousTestSuccessful = true;
   }
 
+  private Map<String, String> getPodTimestamps(String namespace) {
+    ExecResult result = Command.withParams(new CommandParams()
+        .command(KUBERNETES_CLI + " get pods -n " + namespace
+            + " -o=jsonpath='{range .items[*]}{.metadata.name}:{.metadata.creationTimestamp}\\n{end}'")
+        .redirect(true)).executeAndReturnResult();
+
+    Map<String, String> timestamps = new HashMap<>();
+    if (result != null && result.exitValue() == 0 && result.stdout() != null) {
+      String[] lines = result.stdout().replace("'", "").split("\n");
+      for (String line : lines) {
+        String[] parts = line.trim().split(":");
+        if (parts.length == 2) {
+          timestamps.put(parts[0], parts[1]);
+        }
+      }
+    }
+    return timestamps;
+  }
+
   /**
    * Uninstall Traefik.
    */
diff --git a/operator/integration-tests/model-in-image/build-operator.sh b/operator/integration-tests/model-in-image/build-operator.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # 'build-wl-operator.sh'
 #
-# Build and helm install an operator that monitors DOMAIN_NAMESPACE. 
-# 
+# Build and helm install an operator that monitors DOMAIN_NAMESPACE.
+#
 # This script is not necessary if the operator is already running
 # and monitoring DOMAIN_NAMESPACE.
 #
@@ -19,63 +19,76 @@ set -o pipefail
 
 TESTDIR="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 SRCDIR="$( cd "$TESTDIR/../../.." > /dev/null 2>&1 ; pwd -P )"
+cd "${SRCDIR}"
 
-cd ${SRCDIR}
-
-echo "build Operator image"
+echo "Building Operator image..."
 
+# Environment and defaults
 OPER_IMAGE_TAG=${OPER_IMAGE_TAG:-test}
 OPER_IMAGE_NAME=${OPER_IMAGE_NAME:-weblogic-kubernetes-operator}
-OPER_JAR_VERSION="`grep -m1 "<version>" pom.xml | cut -f2 -d">" | cut -f1 -d "<"`"
+OPER_JAR_VERSION="$(grep -m1 '<version>' pom.xml | cut -f2 -d'>' | cut -f1 -d'<')"
 
-echo "OPER_IMAGE_NAME=$OPER_IMAGE_NAME"
-echo "OPER_IMAGE_TAG=$OPER_IMAGE_TAG"
-echo "OPER_JAR_VERSION=$OPER_JAR_VERSION"
+echo "OPER_IMAGE_NAME=${OPER_IMAGE_NAME}"
+echo "OPER_IMAGE_TAG=${OPER_IMAGE_TAG}"
+echo "OPER_JAR_VERSION=${OPER_JAR_VERSION}"
 
+# Generate checksum based on content
 latest_cksum() {
   # force a rebuild even if only image name/tag/ver changes...
   echo "$OPER_IMAGE_NAME $OPER_IMAGE_TAG $OPER_JAR_VERSION"
 
   # force a rebuild if the image isn't cached anymore
-  ${WLSIMG_BUILDER:-docker} images $OPER_IMAGE_NAME:$OPER_IMAGE_TAG -q
-
+  ${WLSIMG_BUILDER:-docker} images "$OPER_IMAGE_NAME:$OPER_IMAGE_TAG" -q || true
   # force a rebuild if any .java, .sh, or .py file changed
-  find "$SRCDIR/operator/src/main" -name "*.[jsp]*" | xargs cat | cksum
-  find "$SRCDIR/operator/src/test" -name "*.[jsp]*" | xargs cat | cksum
+  find "$SRCDIR/operator/src/main" "$SRCDIR/operator/src/test" -type f \( -name "*.java" -o -name "*.sh" -o -name "*.py" \) -exec cat {} + | cksum
 }
 
 save_cksum() {
-  latest_cksum > $SRCDIR/operator/src/main.cksum
+  latest_cksum > "$SRCDIR/operator/src/main.cksum"
 }
 
 old_cksum() {
-  [ -f $SRCDIR/operator/src/main.cksum ] && cat $SRCDIR/operator/src/main.cksum
+  [ -f "$SRCDIR/operator/src/main.cksum" ] && cat "$SRCDIR/operator/src/main.cksum"
 }
 
-if [ "$(old_cksum)" = "$(latest_cksum)" ]; then
-  echo "@@ Info: Skipping oper build/tag - cksum unchanged."
+# Avoid rebuild if nothing changed
+if [ "$(old_cksum 2>/dev/null)" = "$(latest_cksum)" ]; then
+  echo "@@ Info: Skipping Operator image build - no changes detected."
   exit 0
 fi
 
-#mvn clean install -DskipTests -Dcheckstyle.skip
-mvn clean install
-if [ -n "${http_proxy:-}" ]; then
-  HTTP_BUILD_ARG="--build-arg http_proxy=$http_proxy"
-fi
-if [ -n "${https_proxy:-}" ]; then
-  HTTP_BUILD_ARG="$HTTP_BUILD_ARG --build-arg https_proxy=$https_proxy "
-fi
-if [ -n "${no_proxy:-}" ]; then
-  HTTP_BUILD_ARG="$HTTP_BUILD_ARG --build-arg no_proxy=$no_proxy"
-fi
-${WLSIMG_BUILDER:-docker} build ${HTTP_BUILD_ARG:-} -t "$OPER_IMAGE_NAME:$OPER_IMAGE_TAG"  --build-arg VERSION=$OPER_JAR_VERSION --no-cache=true .
+# Clean up target to avoid file lock issues
+echo "@@ Info: Cleaning Maven targets..."
+find "$SRCDIR/operator" -name target -type d -exec chmod -R u+w {} \; -exec rm -rf {} +
+
+# Create unique temp local Maven repo to avoid .m2 lock collisions
+TEMP_M2_REPO="/tmp/m2repo-$RANDOM"
+
+echo "@@ Info: Running Maven build..."
+mvn clean install -Dmaven.repo.local="$TEMP_M2_REPO"
+
+# Handle build args for proxy if set
+HTTP_BUILD_ARG=""
+[ -n "${http_proxy:-}" ] && HTTP_BUILD_ARG+=" --build-arg http_proxy=$http_proxy"
+[ -n "${https_proxy:-}" ] && HTTP_BUILD_ARG+=" --build-arg https_proxy=$https_proxy"
+[ -n "${no_proxy:-}" ] && HTTP_BUILD_ARG+=" --build-arg no_proxy=$no_proxy"
+
+
+${WLSIMG_BUILDER:-docker} build ${HTTP_BUILD_ARG:-} \
+  -t "${OPER_IMAGE_NAME}:${OPER_IMAGE_TAG}" \
+  --build-arg VERSION="${OPER_JAR_VERSION}" \
+  --no-cache=true .
 
 save_cksum
 
-# push to remote repo if cluster is remote
-# if [ -z "$REPO_REGISTRY" ] || [ -z "$REPO_USERNAME" ] || [ -z "$REPO_PASSWORD" ]; then
-#   echo "Provide container registry login details using REPO_REGISTRY, REPO_USERNAME & REPO_PASSWORD env variables to push the Operator image to the repository."
-#   exit 1
+# Optional: push image to remote registry
+# Uncomment if needed and set REPO_REGISTRY, REPO_USERNAME, REPO_PASSWORD
+# if [[ -n "${REPO_REGISTRY:-}" && -n "${REPO_USERNAME:-}" && -n "${REPO_PASSWORD:-}" ]]; then
+#   echo "@@ Info: Pushing image to ${REPO_REGISTRY}..."
+#   ${WLSIMG_BUILDER:-docker} login "$REPO_REGISTRY" -u "$REPO_USERNAME" -p "$REPO_PASSWORD"
+#   ${WLSIMG_BUILDER:-docker} push "${OPER_IMAGE_NAME}:${OPER_IMAGE_TAG}"
+# else
+#   echo "@@ Warning: Skipping ${WLSIMG_BUILDER:-docker} push. Set REPO_REGISTRY, REPO_USERNAME, and REPO_PASSWORD to enable."
 # fi
-# ${WLSIMG_BUILDER:-docker} login $REPO_REGISTRY -u $REPO_USERNAME -p $REPO_PASSWORD	
-# ${WLSIMG_BUILDER:-docker} push ${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}
+
+echo "@@ Done: Operator image built and tagged successfully."
diff --git a/operator/integration-tests/model-in-image/run-test.sh b/operator/integration-tests/model-in-image/run-test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 #
@@ -645,6 +645,10 @@ if [ "$DO_UPDATE4" = "true" ]; then
   doCommand    "\$WORKDIR/model-in-image/utils/patch-introspect-version.sh -d \$DOMAIN_UID -n \$DOMAIN_NAMESPACE"
   waitForDomain Completed
 
+  # Ensure pods are Ready before comparing timestamps
+  echo "@@ Waiting for all pods to be ready in namespace $DOMAIN_NAMESPACE..."
+  ${KUBERNETES_CLI:-kubectl} -n $DOMAIN_NAMESPACE wait --for=condition=Ready pods --all --timeout=300s
+
   if [ ! "$DRY_RUN" = "true" ]; then
     if [ "$KIND_CLUSTER" = "true" ]; then
       testapp internal cluster-1 v2 "'SampleMinThreads' with configured count: 2" 60 quiet
@@ -662,13 +666,21 @@ if [ "$DO_UPDATE4" = "true" ]; then
     fi
 
     podInfoAfter="$(getPodInfo | grep -v introspectVersion)"
-    if [ "$podInfoBefore" = "$podInfoAfter" ]; then
-      trace "No roll detected. Good!"
+    getPodTimestamps() {
+      echo "$1" | grep -E 'name=|creationTimestamp=' | sed -e 's/^ *//' | paste - - | sed 's/ /\\n/g'
+    }
+
+    beforeTimestamps=$(getPodTimestamps "$podInfoBefore")
+    afterTimestamps=$(getPodTimestamps "$podInfoAfter")
+
+    if [ "$beforeTimestamps" = "$afterTimestamps" ]; then
+      trace "No roll detected based on pod creation timestamps. Good!"
     else
-      dumpInfo
-      trace "Info: Pods before:" && echo "${podInfoBefore}"
-      trace "Info: Pods after:" && echo "${podInfoAfter}"
-      trace "Error: Unexpected roll detected."
+      trace "Error: Unexpected roll detected based on creation timestamps."
+      echo "Before timestamps:"
+      echo "$beforeTimestamps"
+      echo "After timestamps:"
+      echo "$afterTimestamps"
       exit 1
     fi
   fi
