Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into fix-int-test-external-jenkins

Author: vanajamukkara

docs/domains/Domain.json

@@ -407,7 +407,7 @@
       "type": "object",
       "properties": {
         "overallHealth": {
-          "description": "Server health of this WebLogic server.",
+          "description": "Server health of this WebLogic server. If the value is \"Not available\", the operator has failed to read the health. If the value is \"Not available (possibly overloaded)\", the operator has failed to read the health of the server possibly due to the server is in overloaded state",
           "type": "string"
         },
         "activationTime": {

docs/domains/Domain.md

@@ -173,7 +173,7 @@ Shutdown describes the configuration for shutting down a server instance.
 | Name | Type | Description |
 | --- | --- | --- |
 | `activationTime` | DateTime | RFC 3339 date and time at which the server started. |
-| `overallHealth` | string | Server health of this WebLogic server. |
+| `overallHealth` | string | Server health of this WebLogic server. If the value is "Not available", the operator has failed to read the health. If the value is "Not available (possibly overloaded)", the operator has failed to read the health of the server possibly due to the server is in overloaded state |
 | `subsystems` | array of [Subsystem Health](#subsystem-health) | Status of unhealthy subsystems, if any. |
 
 ### Channel

docs/domains/index.html

@@ -1327,7 +1327,7 @@
       "type": "object",
       "properties": {
         "overallHealth": {
-          "description": "Server health of this WebLogic server.",
+          "description": "Server health of this WebLogic server. If the value is \"Not available\", the operator has failed to read the health. If the value is \"Not available (possibly overloaded)\", the operator has failed to read the health of the server possibly due to the server is in overloaded state",
           "type": "string"
         },
         "activationTime": {

integration-tests/README.md

@@ -209,7 +209,7 @@ The tests accepts optional env var overrides:
 | RESULT_ROOT | The root directory to use for the tests temporary files. See "Directory Configuration and Structure" for                  defaults and a detailed description of test directories. |
 | PV_ROOT    |  The root directory on the kubernetes cluster used for persistent volumes. See "Directory Configuration and Structure" for defaults and a detailed description of test directories. |
 | QUICKTEST  | When set to "true", limits testing to a subset of the tests. |
-| LB_TYPE    | The default value is "TRAEFIK". Set to "VOYAGER" if you want to use it as LB. |
+| LB_TYPE    | The default value is "TRAEFIK". Set to "VOYAGER" if you want to use it as LB. Using "VOYAGER" requires unique "voyagerWebPort"|
 | INGRESSPERDOMAIN  | The defult value is true. If you want to test creating TRAEFIK LB by kubectl yaml for multiple domains, set it to false. |
 | SHARED_CLUSTER    | Set to true if invoking on shared cluster, set to false or "" if running stand-alone or from Jenkins. Default is "". |
 | JENKINS    | Set to true if invoking from Jenkins, set to false or "" if running stand-alone or on shared cluster. Default is "". |

integration-tests/pom.xml

@@ -352,7 +352,7 @@
 			<id>jrf-integration-tests</id>
 			<properties>
 				<skipITs>false</skipITs>
-				<includes-failsafe>**/JrfInOperatorTest.java</includes-failsafe>
+				<includes-failsafe>**/JrfInOperator*Test.java</includes-failsafe>
 				<jrf_enabled>true</jrf_enabled>
 			</properties>
 		</profile>

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

@@ -93,6 +93,11 @@ public void testCreateDomainTwoConfiguredCluster() throws Exception {
           "createDomainPyScript",
           "integration-tests/src/test/resources/domain-home-on-pv/"
               + TWO_CONFIGURED_CLUSTER_SCRIPT);
+      if ((System.getenv("LB_TYPE") != null && System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER"))
+          || (domainMap.containsKey("loadBalancer")
+              && ((String) domainMap.get("loadBalancer")).equalsIgnoreCase("VOYAGER"))) {
+        domainMap.put("voyagerWebPort", new Integer("30366"));
+      }
       addCluster2ToDomainTemplate();
       domain = TestUtils.createDomain(domainMap);
       domain.verifyDomainCreated();
@@ -136,6 +141,11 @@ public void testCreateDomainTwoMixedCluster() throws Exception {
       domainMap.put(
           "createDomainPyScript",
           "integration-tests/src/test/resources/domain-home-on-pv/" + TWO_MIXED_CLUSTER_SCRIPT);
+      if ((System.getenv("LB_TYPE") != null && System.getenv("LB_TYPE").equalsIgnoreCase("VOYAGER"))
+          || (domainMap.containsKey("loadBalancer")
+              && ((String) domainMap.get("loadBalancer")).equalsIgnoreCase("VOYAGER"))) {
+        domainMap.put("voyagerWebPort", new Integer("30377"));
+      }
       addCluster2ToDomainTemplate();
       domain = TestUtils.createDomain(domainMap);
       domain.verifyDomainCreated();

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

@@ -415,7 +415,7 @@ public void testClusterRestartVersion() throws Exception {
     try {
       // Modify the original domain yaml to include restartVersion in admin server node
       DomainCRD crd = new DomainCRD(originalYaml);
-      Map<String, String> cluster = new HashMap();
+      Map<String, Object> cluster = new HashMap();
       cluster.put("restartVersion", "v1.1");
       crd.addObjectNodeToCluster("cluster-1", cluster);
       String modYaml = crd.getYamlTree();

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

@@ -63,7 +63,8 @@ public static void staticPrepare() throws Exception {
         logger.info("Creating WLS Domain & waiting for the script to complete execution");
         Map<String, Object> domainMap = TestUtils.loadYaml(DOMAINONPV_WLST_YAML);
         // Treafik doesn't work due to the bug 28050300. Use Voyager instead
-        domainMap.put("LB_TYPE", "VOYAGER");
+        domainMap.put("loadBalancer", "VOYAGER");
+        domainMap.put("voyagerWebPort", new Integer("30355"));
         domain = TestUtils.createDomain(domainMap);
         domain.verifyDomainCreated();
       }