Merge remote-tracking branch 'origin/develop' into ingress-clean

Author: rjeberhard

integration-tests/README.md

@@ -268,6 +268,12 @@ mvn -Dit.test="ITOperator#test6CreateConfiguredDomainInTest2NS" -DfailIfNoTests=
 
 mvn -Dit.test="ITOperator#test6CreateConfiguredDomainInTest2NS+test7CreateDomainPVReclaimPolicyRecycle" -DfailIfNoTests=false integration-test -P java-integration-tests
 
+# How to run cleanup script
+
+cleanup script deletes the k8s artifacts, local test tmp directory, delete all helm charts and the potentially remote domain pv directories.
+cd weblogic-kubernetes-operator
+src/integration-tests/bash/cleanup.sh
+
 # Logging/Archiving
 
 Java utils logging is used, writes all the messages to console and java_test_suite.out in $RESULT_ROOT/acceptance_test_tmp directory.

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

@@ -94,6 +94,9 @@ public void test1CreateFirstOperatorAndDomain() throws Exception {
     logTestBegin("test1CreateFirstOperatorAndDomain");
     testCreateOperatorManagingDefaultAndTest1NS();
     domain1 = testAllUseCasesForADomain(operator1, domain1YamlFile);
+    domain1.testWlsLivenessProbe();
+    domain1.destroy();
+
     logger.info("SUCCESS - test1CreateFirstOperatorAndDomain");
   }
 
@@ -128,6 +131,7 @@ public void test3CreateDomainInTest1NS() throws Exception {
     // create domain3
     Domain domain3 = testDomainCreation(domain3YamlFile);
     testWLDFScaling(operator1, domain3);
+    domain3.destroy();
     logger.info("SUCCESS - test3CreateDomainInTest1NS");
   }
 
@@ -157,6 +161,8 @@ public void test5CreateConfiguredDomainInTest2NS() throws Exception {
     }
     if (domain1 == null) {
       domain1 = TestUtils.createDomain(domain1YamlFile);
+    } else {
+      domain1.create();
     }
     logger.info("Checking if operator2 is running, if not creating");
     if (operator2 == null) {
@@ -179,6 +185,8 @@ public void test5CreateConfiguredDomainInTest2NS() throws Exception {
 
     logger.info("Verify no impact on domain4");
     domain4.verifyDomainCreated();
+    domain4.destroy();
+    domain1.destroy();
     logger.info("SUCCESS - test5CreateConfiguredDomainInTest2NS");
   }
 
@@ -194,7 +202,8 @@ public void test6CreateDomainWithStartPolicyAdminOnly() throws Exception {
     }
     logger.info("Creating Domain domain5 & verifing the domain creation");
     // create domain5
-    TestUtils.createDomain(domain5YamlFile);
+    Domain domain5 = TestUtils.createDomain(domain5YamlFile);
+    domain5.destroy();
     logger.info("SUCCESS - test6CreateDomainWithStartPolicyAdminOnly");
   }
 
@@ -216,25 +225,6 @@ public void test7CreateDomainPVReclaimPolicyRecycle() throws Exception {
     logger.info("SUCCESS - test7CreateDomainPVReclaimPolicyRecycle");
   }
 
-  @Test
-  public void test8WlsLivenessProbe() throws Exception {
-
-    logTestBegin("test8WlsLivenessProbe");
-    logger.info("Checking if operator1 is running, if not creating");
-    if (operator1 == null) {
-      operator1 = TestUtils.createOperator(op1YamlFile);
-    }
-    if (domain1 == null) {
-      domain1 = TestUtils.createDomain(domain1YamlFile);
-    }
-    // test managed server1 pod auto restart
-    String domain = domain1.getDomainUid();
-    String namespace = domain1.getDomainMap().get("namespace").toString();
-    String serverName = domain1.getDomainMap().get("managedServerNameBase").toString() + "1";
-    TestUtils.testWlsLivenessProbe(domain, serverName, namespace);
-    logger.info("SUCCESS - test8WlsLivenessProbe");
-  }
-
   @Test
   public void test9CreateDomainOnExistingDir() throws Exception {
     Assume.assumeFalse(
@@ -246,10 +236,10 @@ public void test9CreateDomainOnExistingDir() throws Exception {
     }
     if (domain1 == null) {
       domain1 = TestUtils.createDomain(domain1YamlFile);
+      // create domain on existing dir
+      domain1.destroy();
     }
     logger.info("domain1 " + domain1);
-    // create domain on existing dir
-    domain1.destroy();
     domain1.createDomainOnExistingDirectory();
     logger.info("SUCCESS - test9CreateDomainOnExistingDir");
   }
@@ -267,6 +257,7 @@ public void testACreateDomainApacheLB() throws Exception {
     // create domain7
     Domain domain7 = TestUtils.createDomain(domain7YamlFile);
     domain7.verifyAdminConsoleViaLB();
+    domain7.destroy();
     logger.info("SUCCESS - testACreateDomainApacheLB");
   }
 
@@ -281,7 +272,8 @@ public void testBCreateDomainWithDefaultValuesInSampleInputs() throws Exception
     }
 
     // create domain8
-    testAllUseCasesForADomain(operator1, domain8YamlFile);
+    Domain domain8 = testAllUseCasesForADomain(operator1, domain8YamlFile);
+    domain8.destroy();
     logger.info("SUCCESS - testBCreateDomainWithDefaultValuesInSampleInputs");
   }
 
@@ -296,13 +288,9 @@ private Domain testAllUseCasesForADomain(Operator operator, String domainYamlFil
     logger.info("Creating Domain & verifing the domain creation");
     // create domain1
     Domain domain = testDomainCreation(domainYamlFile);
-    if (System.getenv("QUICKTEST") == null
-        || (System.getenv("QUICKTEST") != null
-            && !System.getenv("QUICKTEST").equalsIgnoreCase("true"))) {
-      testDomainLifecyle(operator, domain);
-      testOperatorLifecycle(operator, domain);
-    }
     testClusterScaling(operator, domain);
+    testDomainLifecyle(operator, domain);
+    testOperatorLifecycle(operator, domain);
     return domain;
   }
 

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

@@ -510,6 +510,13 @@ public String getDomainUid() {
     return domainUid;
   }
 
+  public void testWlsLivenessProbe() throws Exception {
+
+    // test managed server1 pod auto restart
+    String serverName = managedServerNameBase + "1";
+    TestUtils.testWlsLivenessProbe(domainUid, serverName, domainNS);
+  }
+
   private int getAdminSericeLBNodePort() throws Exception {
 
     String adminServerLBNodePortService = domainUid + "-apache-webtier";

integration-tests/src/test/resources/wldf/wldf.py

@@ -3,6 +3,7 @@
 from java.io import File
 import sys, socket
 import os
+import time as systime
 hostname = socket.gethostname()
 
 k8s_master_host=os.environ.get('KUBERNETES_SERVICE_HOST')
@@ -63,4 +64,22 @@
 wh1.addNotification(scriptAct)
 
 save()
-activate()
+activate(block='true')
+
+print "wait for harvester watch to become active"
+
+domainRuntime()
+
+cd('ServerRuntimes/admin-server/WLDFRuntime/WLDFRuntime/WLDFWatchNotificationRuntime/WatchNotification')
+
+numWatchEval=cmo.getTotalHarvesterWatchEvaluations()
+maxwait=300
+
+while(numWatchEval < 1) and (maxwait > 0):
+  print numWatchEval
+  maxwait -= 1
+  systime.sleep(1)
+  numWatchEval=cmo.getTotalHarvesterWatchEvaluations()
+
+print "wldf.py done numWatchEval is ", numWatchEval, " maxwait is ", maxwait
+

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainSpec.java

@@ -560,6 +560,8 @@ public String toString() {
             .appendSuper(super.toString())
             .append("domainUID", domainUID)
             .append("domainName", domainName)
+            .append("domainHome", domainHome)
+            .append("domainHomeInImage", domainHomeInImage)
             .append("adminSecret", adminSecret)
             .append("asName", asName)
             .append("asPort", asPort)
@@ -584,6 +586,8 @@ public int hashCode() {
             .appendSuper(super.hashCode())
             .append(domainUID)
             .append(domainName)
+            .append(domainHome)
+            .append(domainHomeInImage)
             .append(adminSecret)
             .append(asName)
             .append(asPort)
@@ -612,6 +616,8 @@ public boolean equals(Object other) {
             .appendSuper(super.equals(other))
             .append(domainUID, rhs.domainUID)
             .append(domainName, rhs.domainName)
+            .append(domainHome, rhs.domainHome)
+            .append(domainHomeInImage, rhs.domainHomeInImage)
             .append(adminSecret, rhs.adminSecret)
             .append(asName, rhs.asName)
             .append(asPort, rhs.asPort)