consolidate internal and external Jenkins run for testServerPodsRestartByChangingZImage

Author: maggiehe00

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

@@ -52,8 +52,8 @@ public class ItPodsRestart extends BaseTest {
   @BeforeClass
   public static void staticPrepare() throws Exception {
     // initialize test properties and create the directories
-  	if (QUICKTEST) {
-  	//if (!QUICKTEST) {
+  	//if (QUICKTEST) {
+  	if (!QUICKTEST) {
       initialize(APP_PROPS_FILE);
 
       logger.info("Checking if operator1 and domain are running, if not creating");
@@ -80,8 +80,8 @@ public static void staticPrepare() throws Exception {
    */
   @AfterClass
   public static void staticUnPrepare() throws Exception {
-  	if (QUICKTEST) {
-  	//if (!QUICKTEST) {
+  	//if (QUICKTEST) {
+  	if (!QUICKTEST) {
       logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");
@@ -123,7 +123,7 @@ private static void destroyPodsRestartdomain() throws Exception {
    */
   @Test
   public void testServerPodsRestartByChangingEnvProperty() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
@@ -146,7 +146,7 @@ public void testServerPodsRestartByChangingEnvProperty() throws Exception {
    */
   @Test
   public void testServerPodsRestartByChangingLogHomeEnabled() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
@@ -168,7 +168,7 @@ public void testServerPodsRestartByChangingLogHomeEnabled() throws Exception {
    */
   @Test
   public void testServerPodsRestartByChangingImagePullPolicy() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
@@ -191,7 +191,7 @@ public void testServerPodsRestartByChangingImagePullPolicy() throws Exception {
    */
   @Test
   public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
@@ -215,7 +215,7 @@ public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exc
    */
   @Test
   public void testServerPodsRestartByChangingZImage() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
@@ -292,7 +292,7 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
    */
   @Test
   public void testServerPodsRestartByChangingContSecurityContext() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
@@ -329,7 +329,7 @@ public void testServerPodsRestartByChangingContSecurityContext() throws Exceptio
    */
   @Test
   public void testServerPodsRestartByChangingPodSecurityContext() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
@@ -367,7 +367,7 @@ public void testServerPodsRestartByChangingPodSecurityContext() throws Exception
    */
   @Test
   public void testServerPodsRestartByChangingResource() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
@@ -402,7 +402,7 @@ public void testServerPodsRestartByChangingResource() throws Exception {
    */
   @Test
   public void testAdminServerRestartVersion() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
     String podName = domainUid + "-" + domain.getAdminServerName();
@@ -448,7 +448,7 @@ public void testAdminServerRestartVersion() throws Exception {
    */
   @Test
   public void testClusterRestartVersion() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
     String podName = domainUid + "-managed-server1";
@@ -495,7 +495,7 @@ public void testClusterRestartVersion() throws Exception {
    */
   @Test
   public void testMsRestartVersion() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
     String podName = domainUid + "-managed-server1";
@@ -540,9 +540,9 @@ public void testMsRestartVersion() throws Exception {
    * @throws Exception when domain.yaml cannot be read or modified to include the
    *     restartVersion:v1.1
    */
-  //@Test
+  @Test
   public void testDomainRestartVersion() throws Exception {
-    Assume.assumeTrue(QUICKTEST);
+    Assume.Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
     String adminPod = domainUid + "-" + domain.getAdminServerName();