Merge pull request #1104 from oracle/imageschange_external

Fix integration tests running in external Jenkins OCI env

Author: rjeberhard

integration-tests/README.md

@@ -180,23 +180,21 @@ K8sTestUtils - uses k8s java client api, this is used only for delete domain use
 
 * Maven and latest Git should be in PATH
 * export JAVA_HOME
-* export WEBLOGIC_IMAGE_NAME and WEBLOGIC_IMAGE_TAG if different from middleware/weblogic and 12.2.1.3-190111
+* export WEBLOGIC_IMAGE_NAME and WEBLOGIC_IMAGE_TAG if different from container-registry.oracle.com/middleware/weblogic and 12.2.1.3
 * Setup docker access to WebLogic 12c Images 
 
  Method 1 
-  - Setup a personal account on hub.docker.com
-  - Then sign in to hub.docker.com and signup for access to WebLogic 12c Images via https://hub.docker.com/_/oracle-weblogic-server-12c
+  - Setup a personal account on container-registry.oracle.com
+  - Then sign in to container-registry.oracle.com and signup for access to WebLogic 12.2.1.3 images from container-registry.oracle.com/middleware/weblogic:12.2.1.3
   - Then export the following before running the tests: 
 	```
-	export DOCKER_USERNAME=<docker_username>
-	export DOCKER_PASSWORD=<docker_password>
-	export DOCKER_EMAIL=<docker_email>
+	export OCR_USERNAME=<ocr_username>
+	export OCR_PASSWORD=<ocr_password>
 	```
 
  Method 2 
- - Make sure the weblogic image i.e. middleware/weblogic:12.2.1.3-190111 already exists locally in a docker repository the k8s cluster can access
+ - Make sure the weblogic image i.e. container-registry.oracle.com/middleware/weblogic:12.2.1.3 already exists locally in a docker repository the k8s cluster can access
  - Make sure the weblogic image has patch p29135930 (required for the WebLogic Kubernetes Operator). 
-  	- If not, see [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-patch-wls-for-k8s].
 
 
 * Command to run the tests: 

integration-tests/USECASES.MD

@@ -68,7 +68,7 @@ Basic Use Cases described above are verified in all the domain configurations. A
 | Server Pods Restarted by modifying properties on the domain resource| Use Case |
 | --- | --- |
 | Server pods restarted by changing Env property | Verify admin and managed server pods being restarted by property change: `-Dweblogic.StdoutDebugEnabled=false` --> `-Dweblogic.StdoutDebugEnabled=true` |
-| Server pods restarted by changing image | Verify admin and managed server pods being restarted by property change: image: `container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111` --> image: `container-registry.oracle.com/middleware/weblogic:duplicate` |
+| Server pods restarted by changing image | Verify admin and managed server pods being restarted by property change: image: `container-registry.oracle.com/middleware/weblogic:12.2.1.3` --> image: `container-registry.oracle.com/middleware/weblogic:duplicate` |
 | Server pods restarted by changing imagePullPolicy | Verify  admin and managed server pods being restarted by property change: imagePullPolicy: IfNotPresent --> imagePullPolicy: Never |
 | Server pods restarted by changing includeServerOutInPodLog | Verify admin and managed server pods being restarted by property change: includeServerOutInPodLog: true --> includeServerOutInPodLog: false |
 | Server pods restarted by changing logHomeEnable | Verify admin and managed server pods being restarted by property change: logHomeEnabled: true --> logHomeEnabled: false |

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

@@ -71,6 +71,7 @@ public class BaseTest {
   private static Properties appProps;
   private static String weblogicImageTag;
   private static String weblogicImageName;
+  private static String weblogicImageServer;
 
   // Set QUICKTEST env var to true to run a small subset of tests.
   // Set SMOKETEST env var to true to run an even smaller subset of tests
@@ -114,6 +115,10 @@ public static void initialize(String appPropsFile) throws Exception {
         System.getenv("IMAGE_NAME_WEBLOGIC") != null
             ? System.getenv("IMAGE_NAME_WEBLOGIC")
             : appProps.getProperty("weblogicImageName");
+    weblogicImageServer =
+        System.getenv("OCR_SERVER") != null
+            ? System.getenv("OCR_SERVER")
+            : appProps.getProperty("OCR_SERVER");
     maxIterationsPod =
         new Integer(appProps.getProperty("maxIterationsPod", "" + maxIterationsPod)).intValue();
     waitTimePod = new Integer(appProps.getProperty("waitTimePod", "" + waitTimePod)).intValue();
@@ -254,6 +259,16 @@ public static String getWeblogicImageTag() {
   public static String getWeblogicImageName() {
     return weblogicImageName;
   }
+
+  /**
+   * getter method for weblogicImageServer
+   *
+   * @return registry name of the WLS container
+   */
+  public static String getWeblogicImageServer() {
+    return weblogicImageServer;
+  }
+
   /**
    * Call the basic usecases tests
    *

integration-tests/src/test/java/oracle/kubernetes/operator/ITMonitoringExporter.java

@@ -735,17 +735,21 @@ private static void deployMonitoringExporterPrometethusGrafana(
     crdCmd = " kubectl apply -f " + samplesDir + "grafana-deployment.yaml";
     result = ExecCommand.exec(crdCmd);
     logger.info("command result " + result.stdout().trim());
-    domain.deployWebAppViaREST(
-        "wlsexporter", exporterAppPath, BaseTest.getUsername(), BaseTest.getPassword());
+    Map<String, Object> domainMap = domain.getDomainMap();
+    // create the app directory in admin pod
+    TestUtils.kubectlexec(
+        domain.getDomainUid() + ("-") + domainMap.get("adminServerName"),
+        "" + domainMap.get("namespace"),
+        " -- mkdir -p " + appLocationInPod);
+    domain.deployWebAppViaWLST(
+        "wls-exporter", exporterAppPath, appLocationInPod, getUsername(), getPassword(), true);
   }
 
   private static void redeployMonitoringExporter(Domain domain) throws Exception {
     String exporterAppPath = monitoringExporterDir + "/apps/monitoringexporter/wls-exporter.war";
 
-    domain.undeployWebAppViaREST(
-        "wlsexporter", exporterAppPath, BaseTest.getUsername(), BaseTest.getPassword());
-    domain.deployWebAppViaREST(
-        "wlsexporter", exporterAppPath, BaseTest.getUsername(), BaseTest.getPassword());
+    domain.deployWebAppViaWLST(
+        "wls-exporter", exporterAppPath, appLocationInPod, getUsername(), getPassword(), true);
     // check if exporter is up
     domain.callWebAppAndVerifyLoadBalancing("wls-exporter", false);
   }

integration-tests/src/test/java/oracle/kubernetes/operator/ITMultipleClusters.java

@@ -16,6 +16,7 @@
 import oracle.kubernetes.operator.utils.Operator;
 import oracle.kubernetes.operator.utils.TestUtils;
 import org.junit.AfterClass;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -45,18 +46,22 @@ public class ITMultipleClusters extends BaseTest {
    */
   @BeforeClass
   public static void staticPrepare() throws Exception {
-    // initialize test properties and create the directories
-    initialize(APP_PROPS_FILE);
-    String template =
-        BaseTest.getProjectRoot() + "/kubernetes/samples/scripts/common/domain-template.yaml";
-    String add =
-        "  - clusterName: %CLUSTER_NAME%-2\n"
-            + "    serverStartState: \"RUNNING\"\n"
-            + "    replicas: %INITIAL_MANAGED_SERVER_REPLICAS%\n";
-    customDomainTemplate = BaseTest.getResultDir() + "/customDomainTemplate.yaml";
-    Files.copy(
-        Paths.get(template), Paths.get(customDomainTemplate), StandardCopyOption.REPLACE_EXISTING);
-    Files.write(Paths.get(customDomainTemplate), add.getBytes(), StandardOpenOption.APPEND);
+    if (!QUICKTEST) {
+      // initialize test properties and create the directories
+      initialize(APP_PROPS_FILE);
+      String template =
+          BaseTest.getProjectRoot() + "/kubernetes/samples/scripts/common/domain-template.yaml";
+      String add =
+          "  - clusterName: %CLUSTER_NAME%-2\n"
+              + "    serverStartState: \"RUNNING\"\n"
+              + "    replicas: %INITIAL_MANAGED_SERVER_REPLICAS%\n";
+      customDomainTemplate = BaseTest.getResultDir() + "/customDomainTemplate.yaml";
+      Files.copy(
+          Paths.get(template),
+          Paths.get(customDomainTemplate),
+          StandardCopyOption.REPLACE_EXISTING);
+      Files.write(Paths.get(customDomainTemplate), add.getBytes(), StandardOpenOption.APPEND);
+    }
   }
 
   /**
@@ -66,13 +71,14 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-    logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
-    logger.info("BEGIN");
-    logger.info("Run once, release cluster lease");
-    tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
-    logger.info("SUCCESS");
+    if (!QUICKTEST) {
+      logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
+      logger.info("BEGIN");
+      logger.info("Run once, release cluster lease");
+      tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
+      logger.info("SUCCESS");
+    }
   }
-
   /**
    * Create 2 configured clusters in a domain each having 2 managed servers. Verify the managed
    * servers are running and verify the basic use cases.
@@ -81,6 +87,7 @@ public static void staticUnPrepare() throws Exception {
    */
   @Test
   public void testCreateDomainTwoConfiguredCluster() throws Exception {
+    Assume.assumeFalse(QUICKTEST);
 
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
@@ -138,6 +145,7 @@ public void testCreateDomainTwoConfiguredCluster() throws Exception {
    */
   @Test
   public void testCreateDomainTwoMixedCluster() throws Exception {
+    Assume.assumeFalse(QUICKTEST);
     String DOMAINUID = "twomixedclusterdomain";
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
@@ -194,6 +202,7 @@ public void testCreateDomainTwoMixedCluster() throws Exception {
    */
   @Test
   public void testCreateDomainTwoClusterWDTInImage() throws Exception {
+    Assume.assumeFalse(QUICKTEST);
     String DOMAINUID = "twoclusterdomainwdt";
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -437,7 +437,7 @@ public void testOperatorRESTUsingCertificateChain() throws Exception {
    */
   @Test
   public void testDomainInImageUsingWLST() throws Exception {
-    Assume.assumeFalse(QUICKTEST);
+    Assume.assumeTrue(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
@@ -470,6 +470,7 @@ public void testDomainInImageUsingWLST() throws Exception {
   @Test
   public void testDomainInImageUsingWDT() throws Exception {
     Assume.assumeFalse(QUICKTEST);
+
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 

integration-tests/src/test/java/oracle/kubernetes/operator/ITPodsRestart.java

@@ -184,7 +184,7 @@ public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exc
   /**
    * Modify the domain scope property on the domain resource using kubectl apply -f domain.yaml
    * Verify that all the server pods in the domain got re-started .The property tested is: image:
-   * "container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111" --> image:
+   * "container-registry.oracle.com/middleware/weblogic:12.2.1.3" --> image:
    * "container-registry.oracle.com/middleware/weblogic:duplicate"
    *
    * @throws Exception
@@ -196,22 +196,25 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
     logTestBegin(testMethodName);
 
     try {
+      TestUtils.ExecAndPrintLog("docker images");
       logger.info(
           "About to verifyDomainServerPodRestart for Domain: "
               + domain.getDomainUid()
               + "  Image property: "
               + getWeblogicImageName()
               + ":"
               + getWeblogicImageTag()
-              + " to /weblogick8s/middleware/weblogic:duplicate");
+              + " to "
+              + "/weblogick8s/middleware/weblogic:duplicate");
 
       if (BaseTest.SHARED_CLUSTER) {
         String newImage =
             System.getenv("REPO_REGISTRY") + "/weblogick8s/middleware/weblogic:duplicate";
-
         // tag image with repo name
-        TestUtils.exec(
-            "docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage);
+        String tag =
+            "docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage;
+        TestUtils.ExecAndPrintLog(tag);
+        TestUtils.ExecAndPrintLog("docker images");
 
         // login and push image to ocir
         TestUtils.loginAndPushImageToOCIR(newImage);
@@ -230,6 +233,7 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
         domain.verifyDomainServerPodRestart(
             "\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
             "\"" + newImage + "\"");
+
       } else {
         TestUtils.exec(
             "docker tag "

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -379,10 +379,11 @@ public void deployWebAppViaREST(
         .append(":")
         .append(getNodePort())
         .append("/management/weblogic/latest/edit/appDeployments")
-        .append(" --write-out %{http_code} -o /dev/null");
-    logger.fine("Command to deploy webapp " + cmd);
+        .append(" --write-out %{http_code} ");
+    logger.info("Command to deploy webapp " + cmd);
     ExecResult result = TestUtils.exec(cmd.toString());
     String output = result.stdout().trim();
+    logger.info("curl output " + output + " \n err " + result.stderr());
     if (!output.contains("202")) {
       throw new RuntimeException("FAILURE: Webapp deployment failed with response code " + output);
     }

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -238,7 +238,9 @@ public static ExecResult exec(String cmd) throws Exception {
       logger.info(
           "Command "
               + cmd
-              + " failed with stderr = "
+              + " return value "
+              + result.exitValue()
+              + " \n failed with stderr = "
               + result.stderr()
               + " \n stdout = "
               + result.stdout());
@@ -1400,4 +1402,17 @@ public static ExecResult loginAndPushImageToOCIR(String image) throws Exception
             + result.stderr());
     return result;
   }
+
+  public static void ExecAndPrintLog(String command) throws Exception {
+    ExecResult result = ExecCommand.exec(command);
+    logger.info(
+        "\nCommand "
+            + command
+            + "\nreturn value: "
+            + result.exitValue()
+            + "\nstderr = "
+            + result.stderr()
+            + "\nstdout = "
+            + result.stdout());
+  }
 }

integration-tests/src/test/resources/OperatorIT.properties

@@ -7,5 +7,6 @@ username=weblogic
 password=welcome1
 maxIterationsPod=25
 waitTimePod=10
-weblogicImageTag = 12.2.1.3-190111
+weblogicImageTag = 12.2.1.3
 weblogicImageName = container-registry.oracle.com/middleware/weblogic
+OCR_SERVER="container-registry.oracle.com"