Remove oke tag from HPA test (#3638)

* Remove OKE tag  from HPA test

Author: vanajamukkara

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

@@ -4,6 +4,7 @@
 package oracle.weblogic.kubernetes;
 
 import java.util.List;
+import java.util.concurrent.Callable;
 
 import io.kubernetes.client.custom.Quantity;
 import io.kubernetes.client.openapi.models.V1LocalObjectReference;
@@ -30,10 +31,12 @@
 import static oracle.weblogic.kubernetes.TestConstants.METRICS_SERVER_YAML;
 import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
+import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
 import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
 import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.podDoesNotExist;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.podReady;
+import static oracle.weblogic.kubernetes.assertions.TestAssertions.serviceExists;
 import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterAndVerify;
 import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResource;
 import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createDomainResource;
@@ -45,15 +48,21 @@
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
 import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
+import static oracle.weblogic.kubernetes.utils.PodUtils.checkPodReady;
 import static oracle.weblogic.kubernetes.utils.SecretUtils.createSecretWithUsernamePassword;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+/**
+ * Test Horizontal Pod Autoscaler using Kubernetes Metrics Server
+ * by increasing the CPU utilization.
+ * This test is not run on OKE as the CPU utilization is not
+ * going up intermittently after increasing the load.
+ */
 @DisplayName("Test to a create MII domain and test autoscaling using HPA")
 @IntegrationTest
-@Tag("oke-parallel")
 @Tag("kind-parallel")
 public class ItHorizontalPodAutoscaler {
   private static String domainNamespace = null;
@@ -240,8 +249,10 @@ private void createHPA() {
 
   private void createLoadOnCpuAndVerifyAutoscaling() {
     // execute command to increase cpu usage
+    int duration = (OKE_CLUSTER == true) ? 60 : 30;
     String cmd = "kubectl exec -t " + managedServerPrefix + "1 -n "
-        + domainNamespace + "  -- timeout --foreground -s 2 30 dd if=/dev/zero of=/dev/null";
+        + domainNamespace + "  -- timeout --foreground -s 2 "
+        + duration + " dd if=/dev/zero of=/dev/null";
     CommandParams params = new CommandParams().defaults();
     params.command(cmd);
     ExecResult result = Command.withParams(params).executeAndReturnResult();
@@ -250,15 +261,30 @@ private void createLoadOnCpuAndVerifyAutoscaling() {
 
     // check cluster is scaled up
     for (int i = 1; i <= 4; i++) {
-      checkPodReadyAndServiceExists(managedServerPrefix + i, domainUid, domainNamespace);
+      final int j = i;
+      testUntil(
+          withLongRetryPolicy,
+          assertDoesNotThrow(() -> checkHPAAndServiceExists(managedServerPrefix + j,
+                  domainNamespace),
+              String.format("serviceExists failed with ApiException for service %s in namespace %s",
+                  managedServerPrefix + j, domainNamespace)),
+          logger,
+          "service {0} to exist in namespace {1}",
+          managedServerPrefix + j,
+          managedServerPrefix + j);
+
+      logger.info("Waiting for pod {0} to be ready in namespace {1}",
+          managedServerPrefix + i, domainNamespace);
+      checkPodReady(managedServerPrefix + i, domainUid, domainNamespace);
     }
 
     // the command to increase cpu load is ran for 30 sec, after that
     // it takes some time to autoscale down the cluster
     for (int i = 3; i <= 4; i++) {
       final int j = i;
       testUntil(withLongRetryPolicy,
-          assertDoesNotThrow(() -> podDoesNotExist(managedServerPrefix + j, domainUid, domainNamespace),
+          assertDoesNotThrow(() -> checkHPAAndpodDoesNotExist(
+              managedServerPrefix + j, domainUid, domainNamespace),
               String.format("podDoesNotExist failed with ApiException for pod %s in namespace %s",
                   managedServerPrefix + i, domainNamespace)),
           logger,
@@ -274,9 +300,11 @@ private void createLoadOnCpuAndVerifyAutoscaling() {
   // verify hpa is getting the metrics
   private boolean verifyHPA(String namespace, String hpaName) {
     CommandParams params = new CommandParams().defaults();
+    params.saveResults(true);
     params.command("kubectl get hpa " + hpaName + " -n " + namespace);
 
     ExecResult result = Command.withParams(params).executeAndReturnResult();
+    logger.info("Get HPA result " + result);
     /* check if hpa output contains something like 7%/50%
      * kubectl get hpa --all-namespaces
      * NAMESPACE   NAME         REFERENCE            TARGETS   MINPODS   MAXPODS   REPLICAS   AGE
@@ -287,4 +315,14 @@ private boolean verifyHPA(String namespace, String hpaName) {
      */
     return result.stdout().contains("%/");
   }
+
+  private Callable<Boolean> checkHPAAndpodDoesNotExist(String podName, String domainUid, String namespace) {
+    verifyHPA(namespace, clusterResName);
+    return podDoesNotExist(podName, domainUid, namespace);
+  }
+
+  private Callable<Boolean> checkHPAAndServiceExists(String serviceName, String namespace) {
+    verifyHPA(namespace, clusterResName);
+    return serviceExists(serviceName, null, namespace);
+  }
 }