Merge branch 'backport-4416-to40' into 'release/4.0'

Backport MR 4416 to release/4.0

See merge request weblogic-cloud/weblogic-kubernetes-operator!4434

Author: rjeberhard

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSystemResOverrides.java

@@ -53,10 +53,13 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.getNextIntrospectVersion;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServicePort;
+import static oracle.weblogic.kubernetes.actions.TestActions.shutdownDomain;
+import static oracle.weblogic.kubernetes.actions.TestActions.startDomain;
 import static oracle.weblogic.kubernetes.actions.impl.Domain.patchDomainCustomResource;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.podStateNotChanged;
 import static oracle.weblogic.kubernetes.utils.BuildApplication.buildApplication;
 import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResourceAndAddReferenceToDomain;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getHostAndPort;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
@@ -150,6 +153,7 @@ public void initAll(@Namespaces(2) List<String> namespaces) {
 
     //create and start WebLogic domain
     createDomain();
+    restartDomain();
 
     // build the sitconfig application
     Path distDir = buildApplication(Paths.get(APP_DIR, "sitconfig"),
@@ -502,4 +506,26 @@ private void createDomainOnPVUsingWlst(Path wlstScriptFile, Path domainPropertie
         namespace, jobCreationContainer);
   }
 
+  //restart pods by manipulating the serverStartPolicy to Never and IfNeeded
+  private void restartDomain() {
+    logger.info("Restarting domain {0}", domainNamespace);
+    shutdownDomain(domainUid, domainNamespace);
+
+    logger.info("Checking for admin server pod shutdown");
+    checkPodDoesNotExist(adminServerPodName, domainUid, domainNamespace);
+    logger.info("Checking managed server pods were shutdown");
+    for (int i = 1; i <= replicaCount; i++) {
+      checkPodDoesNotExist(managedServerPodNamePrefix + i, domainUid, domainNamespace);
+    }
+
+    startDomain(domainUid, domainNamespace);
+    checkPodReadyAndServiceExists(adminServerPodName, domainUid, domainNamespace);
+    // verify managed server services and pods are created
+    for (int i = 1; i <= replicaCount; i++) {
+      logger.info("Wait for managed pod {0} to be ready in namespace {1}",
+          managedServerPodNamePrefix + i, domainNamespace);
+      checkPodReadyAndServiceExists(managedServerPodNamePrefix + i, domainUid, domainNamespace);
+    }
+  }
+  
 }

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java

@@ -766,7 +766,7 @@ public static void installDBOperator(String namespace) throws IOException {
     replaceStringInFile(operatorYamlDestFile.toString(), "oracle-database-operator-system", namespace);
     replaceStringInFile(operatorYamlDestFile.toString(), "container-registry-secret", TEST_IMAGES_REPO_SECRET_NAME);
     replaceStringInFile(operatorYamlDestFile.toString(),
-        "container-registry.oracle.com/database/operator:0.2.1", DB_OPERATOR_IMAGE);
+        "container-registry.oracle.com/database/operator:1.0.0", DB_OPERATOR_IMAGE);
     createTestRepoSecret(namespace);
     createBaseRepoSecret(namespace);
 
@@ -865,7 +865,7 @@ public static String createOracleDBUsingOperator(String dbName, String sysPasswo
 
     ConditionFactory withLongRetryPolicy = with().pollDelay(2, SECONDS)
         .and().with().pollInterval(10, SECONDS)
-        .atMost(25, MINUTES).await();
+        .atMost(40, MINUTES).await();
 
     // wait for the pod to be ready
     logger.info("Wait for the database {0} pod to be ready in namespace {1}", dbName, namespace);