Skip to content

Commit 8375c1d

Browse files
committed
Merge branch 'remove-up-338' into 'release/4.2'
disable upgrade tests from 338 See merge request weblogic-cloud/weblogic-kubernetes-operator!4785
2 parents 4624720 + ae1bd84 commit 8375c1d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.junit.jupiter.api.AfterEach;
3636
import org.junit.jupiter.api.BeforeAll;
3737
import org.junit.jupiter.api.BeforeEach;
38+
import org.junit.jupiter.api.Disabled;
3839
import org.junit.jupiter.api.DisplayName;
3940
import org.junit.jupiter.api.Tag;
4041
import org.junit.jupiter.api.Test;
@@ -194,7 +195,7 @@ public void tearDown() {
194195
/**
195196
* Operator upgrade from 3.3.8 to current with a FMW Domain.
196197
*/
197-
@Test
198+
@Disabled
198199
@DisplayName("Upgrade Operator from 3.3.8 to current")
199200
void testOperatorFmwUpgradeFrom338ToCurrent() {
200201
installAndUpgradeOperator("3.3.8", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import oracle.weblogic.kubernetes.logging.LoggingFacade;
2222
import org.junit.jupiter.api.AfterEach;
2323
import org.junit.jupiter.api.BeforeEach;
24+
import org.junit.jupiter.api.Disabled;
2425
import org.junit.jupiter.api.DisplayName;
2526
import org.junit.jupiter.api.Tag;
2627
import org.junit.jupiter.api.Test;
@@ -142,7 +143,7 @@ void testOperatorWlsIstioDomainUpgradeFrom344ToCurrent() {
142143
/**
143144
* Upgrade from Operator v3.3.8 to current with Istio enabled domain.
144145
*/
145-
@Test
146+
@Disabled
146147
@DisplayName("Upgrade 3.3.8 Istio Domain(v8) with Istio to current")
147148
void testOperatorWlsIstioDomainUpgradeFrom338ToCurrent() {
148149
logger.info("Starting test to upgrade Istio Image Domain with Istio with v8 schema to current");

0 commit comments

Comments
 (0)