changes for Vanaja's comments

Author: Sankar Periyathambi Neelakandan

integration-tests/USECASES.MD

@@ -137,8 +137,8 @@ Configuration Overrides Usecases
 
 | Operator Upgrade | Use Case |
 | --- | --- |
-| Upgrade 2.0 operator to develop | Upgrade the 2.0 operator running a Weblogic domain to develop version of the Operator and verify apiVersion of the domain CRD shows v4 |
-| Upgrade 2.0.1 operator to develop | Upgrade the 2.0.1 operator running a Weblogic domain to develop version of the Operator and verify apiVersion of the domain CRD shows v4 |
-| Upgrade 2.1 operator to develop | Upgrade the 2.1 operator running a Weblogic domain to develop version of the Operator and verify apiVersion of the domain CRD shows v4 |
-| Upgrade 2.2.0 operator to develop | Upgrade the 2.2.0 operator running a Weblogic domain to develop version of the Operator and verify apiVersion of the domain CRD shows v4 |
-| Upgrade 2.2.1 operator to develop | Upgrade the 2.2.1 operator running a Weblogic domain to develop version of the Operator and verify apiVersion of the domain CRD shows v4 |
+| Upgrade 2.0 operator to develop | Upgrade the 2.0 operator running a Weblogic domain to develop version of the Operator and verify apiVersion of the domain CRD shows latest version |
+| Upgrade 2.0.1 operator to develop | Upgrade the 2.0.1 operator running a Weblogic domain to develop version of the Operator and verify apiVersion of the domain CRD shows latest version |
+| Upgrade 2.1 operator to develop | Upgrade the 2.1 operator running a Weblogic domain to develop version of the Operator and verify apiVersion of the domain CRD shows latest version |
+| Upgrade 2.2.0 operator to develop | Upgrade the 2.2.0 operator running a Weblogic domain to develop version of the Operator and verify apiVersion of the domain CRD shows latest version |
+| Upgrade 2.2.1 operator to develop | Upgrade the 2.2.1 operator running a Weblogic domain to develop version of the Operator and verify apiVersion of the domain CRD shows latest version |

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

@@ -14,7 +14,6 @@
 import java.util.logging.SimpleFormatter;
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
-
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.ExecCommand;
 import oracle.kubernetes.operator.utils.ExecResult;
@@ -73,6 +72,7 @@ public class BaseTest {
   private static String weblogicImageTag;
   private static String weblogicImageName;
   private static String weblogicImageServer;
+  private static String domainApiVersion;
 
   // 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
@@ -120,6 +120,10 @@ public static void initialize(String appPropsFile) throws Exception {
         System.getenv("OCR_SERVER") != null
             ? System.getenv("OCR_SERVER")
             : appProps.getProperty("OCR_SERVER");
+    domainApiVersion =
+        System.getenv("DOMAIN_API_VERSION") != null
+            ? System.getenv("DOMAIN_API_VERSION")
+            : appProps.getProperty("DOMAIN_API_VERSION");
     maxIterationsPod =
         new Integer(appProps.getProperty("maxIterationsPod", "" + maxIterationsPod)).intValue();
     waitTimePod = new Integer(appProps.getProperty("waitTimePod", "" + waitTimePod)).intValue();

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

@@ -31,7 +31,7 @@ public class ItOperatorUpgrade extends BaseTest {
 
   private static final String OP_BASE_REL = "2.0";
   private static final String OP_TARGET_RELEASE = "weblogic-kubernetes-operator:latest";
-  private static final String DOM_TARGET_RELEASE_VERSION = "weblogic.oracle/v4";
+  private static String DOM_TARGET_RELEASE_VERSION = "";
   private static String OP_NS = "";
   private static String OP_DEP_NAME = "";
   private static String OP_SA = "";
@@ -54,6 +54,7 @@ private void setupOperatorAndDomain(String operatorGitRelease, String operatorRe
       throws Exception {
     logger.log(Level.INFO, "+++++++++++++++Beginning Test Setup+++++++++++++++++++++");
     initialize(APP_PROPS_FILE);
+    DOM_TARGET_RELEASE_VERSION = domainApiVersion;
     opUpgradeTmpDir = BaseTest.getResultDir() + "/operatorupgrade";
     TestUtils.exec("rm -rf " + Paths.get(opUpgradeTmpDir).toString());
     Files.createDirectories(Paths.get(opUpgradeTmpDir));

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

@@ -326,7 +326,6 @@ public void callHelmInstall() throws Exception {
         .append(" --set \"imagePullPolicy=")
         .append(imagePullPolicy)
         .append("\" --wait --timeout 60");
-    TestUtils.exec("cat " + generatedInputYamlFile);
     logger.info("Running " + cmd);
     ExecResult result = ExecCommand.exec(cmd.toString());
     if (result.exitValue() != 0) {

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

@@ -10,3 +10,4 @@ waitTimePod=10
 weblogicImageTag = 12.2.1.3
 weblogicImageName = container-registry.oracle.com/middleware/weblogic
 OCR_SERVER="container-registry.oracle.com"
+DOMAIN_API_VERSION = "weblogic.oracle/v4"