Add upgrade tests for 4.0.3 and 4.0.4 (#3867)

Author: anpanigr

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -221,6 +221,24 @@ void testOperatorFmwUpgradeFrom344ToCurrent() {
     installAndUpgradeOperator("3.4.4", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
   }
 
+  /**
+   * Operator upgrade from 4.0.3 to current with a FMW Domain.
+   */
+  @Test
+  @DisplayName("Upgrade Operator from 4.0.3 to current")
+  void testOperatorFmwUpgradeFrom403ToCurrent() {
+    installAndUpgradeOperator("4.0.3", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
+  }
+
+  /**
+   * Operator upgrade from 4.0.4 to current with a FMW Domain.
+   */
+  @Test
+  @DisplayName("Upgrade Operator from 4.0.4 to current")
+  void testOperatorFmwUpgradeFrom404ToCurrent() {
+    installAndUpgradeOperator("4.0.4", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
+  }
+
   private void installAndUpgradeOperator(
          String operatorVersion, String domainVersion,
          String externalServiceNameSuffix) {

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -197,6 +197,28 @@ void testOperatorWlsUpgradeFrom344ToCurrent(String domainType) {
     installAndUpgradeOperator(domainType, "3.4.4", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
   }
 
+  /**
+   * Operator upgrade from 4.0.3 to current.
+   */
+  @ParameterizedTest
+  @DisplayName("Upgrade Operator from 4.0.3 to current")
+  @ValueSource(strings = { "Image", "FromModel" })
+  void testOperatorWlsUpgradeFrom403ToCurrent(String domainType) {
+    logger.info("Starting test testOperatorWlsUpgradeFrom403ToCurrent with domain type {0}", domainType);
+    installAndUpgradeOperator(domainType, "4.0.3", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
+  }
+
+  /**
+   * Operator upgrade from 4.0.4 to current.
+   */
+  @ParameterizedTest
+  @DisplayName("Upgrade Operator from 4.0.4 to current")
+  @ValueSource(strings = { "Image", "FromModel" })
+  void testOperatorWlsUpgradeFrom404ToCurrent(String domainType) {
+    logger.info("Starting test testOperatorWlsUpgradeFrom404ToCurrent with domain type {0}", domainType);
+    installAndUpgradeOperator(domainType, "4.0.4", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
+  }
+
   /**
    * Auxiliary Image Domain upgrade from Operator 3.4.1 to current.
    */