Merge branch 'develop' into sitconfigtests2

Author: sankarpn

docs/domains/Domain.json

@@ -51,6 +51,14 @@
           "items": {
             "$ref": "#/definitions/Channel"
           }
+        },
+        "annotations": {
+          "description": "Annotations to associate with the external channel service",
+          "$ref": "#/definitions/Map"
+        },
+        "labels": {
+          "description": "Labels to associate with the external channel service",
+          "$ref": "#/definitions/Map"
         }
       }
     },

docs/domains/Domain.md

@@ -144,7 +144,9 @@ ServerPod describes the configuration for a Kubernetes pod for a server.
 
 | Name | Type | Description |
 | --- | --- | --- |
+| annotations | Map | Annotations to associate with the external channel service |
 | channels | array of [Channel](#channel) | Specifies which of the admin server's WebLogic channels should be exposed outside the Kubernetes cluster via a node port service, along with the node port for each channel. If not specified, the admin server's node port service will not be created. |
+| labels | Map | Labels to associate with the external channel service |
 
 ### Probe Tuning
 

docs/domains/index.html

@@ -971,6 +971,14 @@
           "items": {
             "$ref": "#/definitions/Channel"
           }
+        },
+        "annotations": {
+          "description": "Annotations to associate with the external channel service",
+          "$ref": "#/definitions/Map"
+        },
+        "labels": {
+          "description": "Labels to associate with the external channel service",
+          "$ref": "#/definitions/Map"
         }
       }
     },

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

@@ -1,7 +1,6 @@
 // Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
-
 package oracle.kubernetes.operator;
 
 import java.nio.file.Files;
@@ -25,9 +24,28 @@
  * extend this class.
  */
 public class BaseTest {
+
   public static final Logger logger = Logger.getLogger("OperatorIT", "OperatorIT");
   public static final String TESTWEBAPP = "testwebapp";
 
+  // property file used to customize operator properties for operator inputs yaml
+  public static final String OPERATOR1_YAML = "operator1.yaml";
+  public static final String OPERATOR2_YAML = "operator2.yaml";
+  public static final String OPERATORBC_YAML = "operator_bc.yaml";
+  public static final String OPERATOR_CHAIN_YAML = "operator_chain.yaml";
+
+  // file used to customize domain properties for domain, PV and LB inputs yaml
+  public static final String DOMAINONPV_WLST_YAML = "domainonpvwlst.yaml";
+  public static final String DOMAINONPV_WDT_YAML = "domainonpvwdt.yaml";
+  public static final String DOMAIN_ADMINONLY_YAML = "domainadminonly.yaml";
+  public static final String DOMAIN_RECYCLEPOLICY_YAML = "domainrecyclepolicy.yaml";
+  public static final String DOMAIN_SAMPLE_DEFAULTS_YAML = "domainsampledefaults.yaml";
+  public static final String DOMAININIMAGE_WLST_YAML = "domaininimagewlst.yaml";
+  public static final String DOMAININIMAGE_WDT_YAML = "domaininimagewdt.yaml";
+
+  // property file used to configure constants for integration tests
+  public static final String APP_PROPS_FILE = "OperatorIT.properties";
+
   private static String resultRoot = "";
   private static String pvRoot = "";
   private static String resultDir = "";
@@ -42,6 +60,30 @@ public class BaseTest {
   private static String appLocationInPod = "/u01/oracle/apps";
   private static Properties appProps;
 
+  public static boolean QUICKTEST;
+  public static boolean SMOKETEST;
+  public static boolean JENKINS;
+  public static boolean INGRESSPERDOMAIN = true;
+
+  // 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
+  // set INGRESSPERDOMAIN to false to create LB's ingress by kubectl yaml file
+  static {
+    QUICKTEST =
+        System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true");
+    SMOKETEST =
+        System.getenv("SMOKETEST") != null && System.getenv("SMOKETEST").equalsIgnoreCase("true");
+    if (SMOKETEST) {
+      QUICKTEST = true;
+    }
+    if (System.getenv("JENKINS") != null) {
+      JENKINS = new Boolean(System.getenv("JENKINS")).booleanValue();
+    }
+    if (System.getenv("INGRESSPERDOMAIN") != null) {
+      INGRESSPERDOMAIN = new Boolean(System.getenv("INGRESSPERDOMAIN")).booleanValue();
+    }
+  }
+
   public static void initialize(String appPropsFile) throws Exception {
 
     // load app props defined
@@ -96,6 +138,28 @@ public static void initialize(String appPropsFile) throws Exception {
               + "\n"
               + clnResult.stderr());
     }
+
+    if (System.getenv("JENKINS") != null) {
+      logger.info("Creating " + resultRoot + "/acceptance_test_tmp");
+      TestUtils.exec(
+          "/usr/local/packages/aime/ias/run_as_root \"mkdir -p "
+              + resultRoot
+              + "/acceptance_test_tmp\"");
+      TestUtils.exec(
+          "/usr/local/packages/aime/ias/run_as_root \"chmod 777 "
+              + resultRoot
+              + "/acceptance_test_tmp\"");
+      logger.info("Creating " + pvRoot + "/acceptance_test_pv");
+      TestUtils.exec(
+          "/usr/local/packages/aime/ias/run_as_root \"mkdir -p "
+              + pvRoot
+              + "/acceptance_test_pv\"");
+      TestUtils.exec(
+          "/usr/local/packages/aime/ias/run_as_root \"chmod 777 "
+              + pvRoot
+              + "/acceptance_test_pv\"");
+    }
+
     // create resultRoot, PVRoot, etc
     Files.createDirectories(Paths.get(resultRoot));
     Files.createDirectories(Paths.get(resultDir));
@@ -543,23 +607,37 @@ private void callWebAppAndVerifyScaling(Domain domain, int replicas) throws Exce
   }
 
   public static void tearDown() throws Exception {
+    logger.log(
+        Level.INFO,
+        "TEARDOWN: Starting Test Run TearDown (cleanup and state-dump)."
+            + " Note that if the test failed previous to tearDown, "
+            + " the error that caused the test failure may be reported "
+            + "after the tearDown completes. Note that tearDown itself may report errors,"
+            + " but this won't affect the outcome of the test results.");
     StringBuffer cmd =
         new StringBuffer("export RESULT_ROOT=$RESULT_ROOT && export PV_ROOT=$PV_ROOT && ");
     cmd.append(BaseTest.getProjectRoot())
         .append("/integration-tests/src/test/resources/statedump.sh");
     logger.info("Running " + cmd);
 
+    // renew lease before callin statedump.sh
+    TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
+
     ExecResult result = ExecCommand.exec(cmd.toString());
     if (result.exitValue() == 0) {
-      logger.info("Executed statedump.sh " + result.stdout());
+      // logger.info("Executed statedump.sh " + result.stdout());
     } else {
       logger.info("Execution of statedump.sh failed, " + result.stderr() + "\n" + result.stdout());
     }
 
-    // if (JENKINS) {
-    result = cleanup();
-    logger.info("cleanup result =" + result.stdout() + "\n " + result.stderr());
-    // }
+    TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
+
+    if (JENKINS) {
+      result = cleanup();
+      if (result.exitValue() != 0) {
+        logger.info("cleanup result =" + result.stdout() + "\n " + result.stderr());
+      }
+    }
 
     if (getLeaseId() != "") {
       logger.info("Release the k8s cluster lease");