fix

sankarpn · sankarpn · commit 63bc9740fb03 · 2019-07-09T17:18:20.000-07:00
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ITOperatorUpgrade.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ITOperatorUpgrade.java
@@ -213,6 +213,13 @@ private void upgradeOperatorHelm(String upgradeRelease) throws Exception {
       Thread.sleep(1000 * 10);
       TestUtils.ExecAndPrintLog(
           "kubectl get domain -n weblogic-domain  operator20domain -o jsonpath={.apiVersion}");
+      ExecResult exec =
+          TestUtils.exec(
+              "kubectl get domain -n weblogic-domain  operator20domain -o jsonpath={.apiVersion}");
+      if (exec.stdout().contains("weblogic.oracle/v4")) {
+        logger.log(Level.INFO, "Got the expected apiVersion");
+        break;
+      }
     }
     TestUtils.ExecAndPrintLog("kubectl get all --all-namespaces");
   }

Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,13 @@ private void upgradeOperatorHelm(String upgradeRelease) throws Exception {`
`213`	`213`	`Thread.sleep(1000 * 10);`
`214`	`214`	`TestUtils.ExecAndPrintLog(`
`215`	`215`	`"kubectl get domain -n weblogic-domain operator20domain -o jsonpath={.apiVersion}");`
	`216`	`+ ExecResult exec =`
	`217`	`+ TestUtils.exec(`
	`218`	`+ "kubectl get domain -n weblogic-domain operator20domain -o jsonpath={.apiVersion}");`
	`219`	`+ if (exec.stdout().contains("weblogic.oracle/v4")) {`
	`220`	`+ logger.log(Level.INFO, "Got the expected apiVersion");`
	`221`	`+ break;`
	`222`	`+ }`
`216`	`223`	`}`
`217`	`224`	`TestUtils.ExecAndPrintLog("kubectl get all --all-namespaces");`
`218`	`225`	`}`