more changes

Author: sankarpn

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

@@ -139,27 +139,6 @@ public static void initialize(String appPropsFile) throws Exception {
               + 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));

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

@@ -53,7 +53,9 @@ public static void staticUnPrepare() throws Exception {
     logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
     logger.info("BEGIN");
     logger.info("Run once, release cluster lease");
+
     tearDown();
+
     logger.info("SUCCESS");
   }
 
@@ -87,7 +89,9 @@ public void testDomainOnPVUsingWLST() throws Exception {
       testBasicUseCases(domain);
       TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
       testAdvancedUseCasesForADomain(operator1, domain);
+
       if (!SMOKETEST) domain.testWlsLivenessProbe();
+
       testCompletedSuccessfully = true;
     } finally {
       if (domain != null && !SMOKETEST && (JENKINS || testCompletedSuccessfully))

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

@@ -3,8 +3,6 @@
 // http://oss.oracle.com/licenses/upl.
 package oracle.kubernetes.operator;
 
-import static oracle.kubernetes.operator.BaseTest.getLeaseId;
-import static oracle.kubernetes.operator.BaseTest.getProjectRoot;
 import static oracle.kubernetes.operator.BaseTest.initialize;
 import static oracle.kubernetes.operator.BaseTest.logger;
 
@@ -23,11 +21,6 @@
 
 public class ITSitConfig extends BaseTest {
 
-  private static final String OPERATOR1FILE = "operator1.yaml";
-  private static final String OPERATOR2FILE = "operator2.yaml";
-  private static final String DOMAINONPVWLSTFILE = "domainonpvwlst.yaml";
-  private static final String DOMAINONPVWDTFILE = "domainonpvwdt.yaml";
-  private static String TESTSRCDIR = "";
   private static String TESTSCRIPTDIR = "";
 
   private static String ADMINPODNAME = "";
@@ -37,35 +30,7 @@ public class ITSitConfig extends BaseTest {
   private static String fqdn = "";
 
   private static Domain domain = null;
-  private static Operator operator1, operator2;
-  // property file used to configure constants for integration tests
-  private static final String APPPROPSFILE = "OperatorIT.properties";
-
-  private static boolean QUICKTEST;
-  private static final boolean SMOKETEST;
-  private static boolean JENKINS;
-  private 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, plus leave domain1 up and running when the test completes.
-  // 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 = Boolean.valueOf(System.getenv("JENKINS"));
-    }
-    if (System.getenv("INGRESSPERDOMAIN") != null) {
-      INGRESSPERDOMAIN = Boolean.valueOf(System.getenv("INGRESSPERDOMAIN"));
-    }
-  }
-
+  private static Operator operator1;
   /**
    * This method gets called only once before any of the test methods are executed. It does the
    * initialization of the integration test properties defined in OperatorIT.properties and setting
@@ -79,10 +44,10 @@ public static void staticPrepare() throws Exception {
 
     if (!QUICKTEST) {
       // initialize test properties and create the directories
-      initialize(APPPROPSFILE);
+      initialize(APP_PROPS_FILE);
 
       if (operator1 == null) {
-        operator1 = TestUtils.createOperator(OPERATOR1FILE);
+        operator1 = TestUtils.createOperator(OPERATOR1_YAML);
       }
       TESTSCRIPTDIR = BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/";
       domain = createSitConfigDomain();
@@ -116,10 +81,6 @@ public static void staticUnPrepare() throws Exception {
 
       destroySitConfigDomain();
       tearDown();
-      if (!"".equals(getLeaseId())) {
-        logger.info("Release the k8s cluster lease");
-        TestUtils.releaseLease(getProjectRoot(), getLeaseId());
-      }
       logger.info("SUCCESS");
     }
   }
@@ -225,7 +186,7 @@ public void testCustomSitConfigOverridesForWldf() throws Exception {
   private static Domain createSitConfigDomain() throws Exception {
     String createDomainScript = TESTSCRIPTDIR + "/domain-home-on-pv/create-domain.py";
     // load input yaml to map and add configOverrides
-    Map<String, Object> domainMap = TestUtils.loadYaml(DOMAINONPVWLSTFILE);
+    Map<String, Object> domainMap = TestUtils.loadYaml(DOMAINONPV_WLST_YAML);
     domainMap.put("configOverrides", "sitconfigcm");
     domainMap.put(
         "configOverridesFile", "/integration-tests/src/test/resources/sitconfig/configoverrides");
@@ -239,10 +200,6 @@ private static Domain createSitConfigDomain() throws Exception {
         "javaOptions",
         "-Dweblogic.debug.DebugSituationalConfig=true -Dweblogic.debug.DebugSituationalConfigDumpXml=true");
 
-    // use NFS for this domain on Jenkins, defaultis HOST_PATH
-    if (System.getenv("JENKINS") != null && System.getenv("JENKINS").equalsIgnoreCase("true")) {
-      domainMap.put("weblogicDomainStorageType", "NFS");
-    }
     domain = TestUtils.createDomain(domainMap);
     domain.verifyDomainCreated();
     return domain;

integration-tests/src/test/resources/sitconfig/java/SitConfigTests.java

@@ -1,8 +1,7 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+// 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.io.IOException;

integration-tests/src/test/resources/sitconfig/scripts/create-domain-auto-custom-sit-config20.py

@@ -1,4 +1,4 @@
-# Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2019, 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.
 
 def getEnvVar(var):