Skip to content

Commit 8ce9120

Browse files
authored
add upgrade tests for release/3.4.4 (#3580)
1 parent 90d5cef commit 8ce9120

File tree

3 files changed

+49
-25
lines changed

3 files changed

+49
-25
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,21 +203,21 @@ void testOperatorFmwUpgradeFrom338ToCurrent() {
203203
}
204204

205205
/**
206-
* Operator upgrade from 3.4.0 to current with a FMW Domain.
206+
* Operator upgrade from 3.4.3 to current with a FMW Domain.
207207
*/
208208
@Test
209-
@DisplayName("Upgrade Operator from 3.4.0 to current")
210-
void testOperatorFmwUpgradeFrom340ToCurrent() {
211-
installAndUpgradeOperator("3.4.0", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
209+
@DisplayName("Upgrade Operator from 3.4.3 to current")
210+
void testOperatorFmwUpgradeFrom343ToCurrent() {
211+
installAndUpgradeOperator("3.4.3", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
212212
}
213213

214214
/**
215-
* Operator upgrade from 3.4.1 to current with a FMW Domain.
215+
* Operator upgrade from 3.4.4 to current with a FMW Domain.
216216
*/
217217
@Test
218-
@DisplayName("Upgrade Operator from 3.4.1 to current")
219-
void testOperatorFmwUpgradeFrom341ToCurrent() {
220-
installAndUpgradeOperator("3.4.1", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
218+
@DisplayName("Upgrade Operator from 3.4.4 to current")
219+
void testOperatorFmwUpgradeFrom344ToCurrent() {
220+
installAndUpgradeOperator("3.4.4", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
221221
}
222222

223223
private void installAndUpgradeOperator(

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,25 @@ public void beforeEach(@Namespaces(2) List<String> namespaces) {
109109
}
110110

111111
/**
112-
* Upgrade from Operator v3.4.1 to current with Istio enabled domain.
112+
* Upgrade from Operator 3.4.3 to current with Istio enabled domain.
113113
*/
114114
@Test
115-
@DisplayName("Upgrade 3.4.1 Istio Domain(v8) with Istio to current")
116-
void testOperatorWlsIstioDomainUpgradeFrom341ToCurrent() {
117-
logger.info("Starting test to upgrade Istio Image Domain with Istio with v8 schema to current");
118-
upgradeWlsIstioDomain("3.4.1");
115+
@DisplayName("Upgrade 3.4.3 Istio Domain(v8) with Istio to current")
116+
void testOperatorWlsIstioDomainUpgradeFrom343ToCurrent() {
117+
logger.info("Starting testOperatorWlsIstioDomainUpgradeFrom343ToCurrent"
118+
+ " to upgrade Istio Image Domain with Istio with v8 schema to current");
119+
upgradeWlsIstioDomain("3.4.3");
120+
}
121+
122+
/**
123+
* Upgrade from Operator 3.4.4 to current with Istio enabled domain.
124+
*/
125+
@Test
126+
@DisplayName("Upgrade 3.4.4 Istio Domain(v8) with Istio to current")
127+
void testOperatorWlsIstioDomainUpgradeFrom344ToCurrent() {
128+
logger.info("Starting testOperatorWlsIstioDomainUpgradeFrom344ToCurrent"
129+
+ " to upgrade Istio Image Domain with Istio with v8 schema to current");
130+
upgradeWlsIstioDomain("3.4.4");
119131
}
120132

121133
/**

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

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,37 +175,49 @@ void testOperatorWlsUpgradeFrom338ToCurrent(String domainType) {
175175
}
176176

177177
/**
178-
* Operator upgrade from 3.4.0 to current.
178+
* Operator upgrade from 3.4.3 to current.
179179
*/
180180
@ParameterizedTest
181-
@DisplayName("Upgrade Operator from 3.4.0 to current")
181+
@DisplayName("Upgrade Operator from 3.4.3 to current")
182182
@ValueSource(strings = { "Image", "FromModel" })
183-
void testOperatorWlsUpgradeFrom340ToCurrent(String domainType) {
184-
logger.info("Starting test testOperatorWlsUpgradeFrom340ToCurrent with domain type {0}", domainType);
185-
installAndUpgradeOperator(domainType, "3.4.0", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
183+
void testOperatorWlsUpgradeFrom343ToCurrent(String domainType) {
184+
logger.info("Starting test testOperatorWlsUpgradeFrom343ToCurrent with domain type {0}", domainType);
185+
installAndUpgradeOperator(domainType, "3.4.3", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
186186
}
187187

188188
/**
189-
* Operator upgrade from 3.4.1 to current.
189+
* Operator upgrade from 3.4.4 to current.
190190
*/
191191
@ParameterizedTest
192-
@DisplayName("Upgrade Operator from 3.4.1 to current")
192+
@DisplayName("Upgrade Operator from 3.4.4 to current")
193193
@ValueSource(strings = { "Image", "FromModel" })
194-
void testOperatorWlsUpgradeFrom341ToCurrent(String domainType) {
195-
logger.info("Starting test testOperatorWlsUpgradeFrom341ToCurrent with domain type {0}", domainType);
196-
installAndUpgradeOperator(domainType, "3.4.1", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
194+
void testOperatorWlsUpgradeFrom344ToCurrent(String domainType) {
195+
logger.info("Starting test testOperatorWlsUpgradeFrom344ToCurrent with domain type {0}", domainType);
196+
installAndUpgradeOperator(domainType, "3.4.4", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
197197
}
198198

199199
/**
200-
* Auxiliary Image Domain upgrade from Operator v3.4.1 to current.
200+
* Auxiliary Image Domain upgrade from Operator 3.4.1 to current.
201201
*/
202202
@Test
203203
@DisplayName("Upgrade 3.4.1 Auxiliary Domain(v8 schema) Image to current")
204204
void testOperatorWlsAuxDomainUpgradeFrom341ToCurrent() {
205-
logger.info("Starting test to upgrade Domain with Auxiliary Image with v8 schema to current");
205+
logger.info("Starting testOperatorWlsAuxDomainUpgradeFrom341ToCurrent "
206+
+ "to upgrade Domain with Auxiliary Image with v8 schema to current");
206207
upgradeWlsAuxDomain("3.4.1");
207208
}
208209

210+
/**
211+
* Auxiliary Image Domain upgrade from Operator 3.4.4 to current.
212+
*/
213+
@Test
214+
@DisplayName("Upgrade 3.4.4 Auxiliary Domain(v8 schema) Image to current")
215+
void testOperatorWlsAuxDomainUpgradeFrom344ToCurrent() {
216+
logger.info("Starting testOperatorWlsAuxDomainUpgradeFrom344ToCurrent "
217+
+ "to upgrade Domain with Auxiliary Image with v8 schema to current");
218+
upgradeWlsAuxDomain("3.4.4");
219+
}
220+
209221
/**
210222
* Auxiliary Image Domain upgrade from Operator v3.3.8 to current.
211223
* Currently we do not support AuxDomain upgrade 3.3.8 to Latest with

0 commit comments

Comments
 (0)