Merge branch 'OWLS-109113' into 'main'

New Domain on PV samples integration tests, changes to existing model in image sample to make AI mode default and refactoring changes,  and remove MII JRF samples

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

Author: rjeberhard

README.md

@@ -11,7 +11,7 @@ You can:
 * Supply WebLogic domain configuration using:
   * _Model in Image_: Includes [WebLogic Deploy Tooling](https://github.com/oracle/weblogic-deploy-tooling) models and archives in a container image.
   * _Domain in Image_: Includes a WebLogic domain home in a container image.
-  * _Domain in PV_: Locates WebLogic domain homes in a Kubernetes PersistentVolume (PV). This PV can reside in an NFS file system or other Kubernetes volume types.
+  * _Domain on PV_: Locates WebLogic domain homes in a Kubernetes PersistentVolume (PV). This PV can reside in an NFS file system or other Kubernetes volume types.
 * Configure deployment of WebLogic domains as Kubernetes resources (using Kubernetes custom resource definitions).
 * Override certain aspects of the WebLogic domain configuration; for example, use a different database password for different deployments.
 * Start and stop servers and clusters in the domain based on declarative startup parameters and desired states.

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

@@ -21,6 +21,7 @@
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -78,6 +79,7 @@
 @IntegrationTest
 @Tag("samples")
 @Tag("kind-parallel")
+@Disabled
 public class ItFmwDiiSample {
 
   private static String dbNamespace = null;

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

@@ -16,6 +16,7 @@
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -81,6 +82,7 @@
 @Tag("olcne")
 @Tag("kind-parallel")
 @Tag("toolkits-srg")
+@Disabled
 public class ItFmwSample {
 
   private static String dbNamespace = null;

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

@@ -10,6 +10,7 @@
 import oracle.weblogic.kubernetes.utils.ItMiiSampleHelper;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
@@ -32,6 +33,7 @@
 @Tag("kind-parallel")
 @Tag("toolkits-srg")
 @Tag("okd-wls-mrg")
+@Disabled
 class ItMiiSampleWlsAux {
 
   private static ItMiiSampleHelper myItMiiSampleHelper = null;

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

@@ -10,6 +10,7 @@
 import oracle.weblogic.kubernetes.utils.ItMiiSampleHelper;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
@@ -32,6 +33,7 @@
 @Tag("okd-wls-mrg")
 @Tag("samples")
 @Tag("olcne")
+@Disabled
 class ItMiiSampleWlsMain {
 
   private static ItMiiSampleHelper myItMiiSampleHelper = null;

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

@@ -22,6 +22,7 @@
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
 import oracle.weblogic.kubernetes.utils.ExecResult;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
@@ -115,6 +116,7 @@
 @Tag("toolkits-srg")
 @Tag("oke-sequential")
 @IntegrationTest
+@Disabled
 class ItWlsSamples {
 
   public static final String SERVER_LIFECYCLE = "Server";

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

@@ -273,7 +273,7 @@ public void callInitialUseCase(String testClassName) {
     String decoration = (envMap.get("DO_AI") != null && envMap.get("DO_AI").equalsIgnoreCase("true"))  ? "AI-" : "";
     envMap.put("MODEL_IMAGE_TAG",
         MII_BASIC_IMAGE_TAG + "-" + domainType + "-" + decoration + "v1");
-    envMap.put("MODEL_DIR", "model-images/model-in-image__" + domainType + "-v1");
+    envMap.put("MODEL_DIR", "wdt-artifacts/wdt-model-files/" + domainType + "-v1");
 
     if (domainType.equals(DomainType.JRF)) {
       String dbImageName = DB_IMAGE_TO_USE_IN_SPEC
@@ -330,7 +330,7 @@ public void callUpdateUseCase(String args, String errString, String testClassNam
       envMap.put("MODEL_IMAGE_NAME", imageName);
       String decoration = (envMap.get("DO_AI") != null && envMap.get("DO_AI").equalsIgnoreCase("true"))  ? "AI-" : "";
       envMap.put("MODEL_IMAGE_TAG", MII_BASIC_IMAGE_TAG + "-" + domainType + "-" + decoration + "v2");
-      envMap.put("MODEL_DIR", "model-images/model-in-image__" + domainType + "-v2");
+      envMap.put("MODEL_DIR", "wdt-artifacts/wdt-model-files/" + domainType + "-v2");
     }
 
     execTestScriptAndAssertSuccess(domainType, args, errString);