Skip to content

Commit edf4609

Browse files
rjeberhardrjeberhard
committed
Merge branch 'update_images' into 'main'
Update images and tests See merge request weblogic-cloud/weblogic-kubernetes-operator!5055
2 parents bfc177d + 77047f2 commit edf4609

File tree

9 files changed

+109
-118
lines changed

9 files changed

+109
-118
lines changed

‎Jenkinsfile.podman‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,18 @@ pipeline {
145145
)
146146
string(name: 'WEBLOGIC_IMAGE_NAME',
147147
description: 'WebLogic base image name. Default is the image name in BASE_IMAGES_REPO. Use middleware/weblogic for OCR.',
148-
defaultValue: "test-images/weblogic"
148+
defaultValue: "test-images/weblogic_cpu"
149149
)
150150
string(name: 'WEBLOGIC_IMAGE_TAG',
151-
description: '14.1.2.0-generic-jdk17-ol8, 14.1.2.0-generic-jdk17-ol9, 14.1.2.0-generic-jdk21-ol8, 14.1.2.0-generic-jdk21-ol9, 12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8',
151+
description: '14.1.2.0-generic-jdk17-ol8, 14.1.2.0-generic-jdk17-ol9, 14.1.2.0-generic-jdk21-ol8, 14.1.2.0-generic-jdk21-ol9, 12.2.1.4-generic-jdk8-ol7, 12.2.1.4-generic-jdk8-ol8, 12.2.1.4-generic-jdk8-ol9, 12.2.1.4-slim-jdk8-ol7,12.2.1.4-slim-jdk8-ol7, 12.2.1.4-slim-jdk8-ol7, 14.1.1.0-generic-jdk8-ol7, 14.1.1.0-generic-jdk8-ol8, 14.1.1.0-generic-jdk8-ol9, 14.1.1.0-generic-jdk11-ol8, 14.1.1.0-generic-jdk11-ol9, 14.1.1.0-slim-jdk11-ol7, 14.1.1.0-slim-jdk11-ol8, 14.1.1.0-slim-jdk8-ol7, 14.1.1.0-slim-jdk8-ol8',
152152
defaultValue: '14.1.2.0-generic-jdk17-ol8'
153153
)
154154
string(name: 'FMWINFRA_IMAGE_NAME',
155155
description: 'FWM Infra image name. Default is the image name in BASE_IMAGES_REPO. Use middleware/fmw-infrastructure for OCR.',
156-
defaultValue: "test-images/fmw-infrastructure"
156+
defaultValue: "test-images/fmw-infrastructure_cpu"
157157
)
158158
string(name: 'FMWINFRA_IMAGE_TAG',
159-
description: '14.1.2.0-jdk17-ol8, 14.1.2.0-jdk17-ol9, 14.1.2.0-jdk21-ol8, 14.1.2.0-jdk21-ol9',
159+
description: '14.1.2.0-jdk17-ol8, 14.1.2.0-jdk17-ol9, 14.1.2.0-jdk21-ol8, 14.1.2.0-jdk21-ol9,12.2.1.4-jdk8-ol8, 12.2.1.4-jdk8-ol9',
160160
defaultValue: '14.1.2.0-jdk17-ol8'
161161
)
162162
string(name: 'DB_IMAGE_NAME',

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomainUpgradeToSecureMode.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ class ItMiiDomainUpgradeToSecureMode {
129129
String adminIngressHost;
130130
String adminAppIngressHost;
131131
String clusterIngressHost;
132-
private final String imageTag1411 = "14.1.1.0-11";
133-
private final String imageTag12214 = "12.2.1.4";
134-
private final String imageTag1412 = "14.1.2.0.0-jdk17";
132+
private final String imageTag1411 = "14.1.1.0-generic-jdk11-ol8";
133+
private final String imageTag12214 = "12.2.1.4-generic-jdk8-ol8";
134+
private final String imageTag1412 = "14.1.2.0-generic-jdk17-ol8";
135135
private final String image1412 = BASE_IMAGES_PREFIX + WEBLOGIC_IMAGE_NAME_DEFAULT + ":" + imageTag1412;
136136
private final String sampleAppUri = "/sample-war/index.jsp?terminateSession=true";
137137
private final String adminAppUri = "/management/tenant-monitoring/servers";

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMultiDomainModelsUpgradeAndScale.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ void beforeEach(@Namespaces(4) List<String> namespaces) {
145145
}
146146

147147
/**
148-
* Create 3 different types of domains with operator 4.0.8 (domain-on-pv, domain-in-image and model-in-image).
148+
* Create 3 different types of domains with operator 4.2.0 (domain-on-pv, domain-in-image and model-in-image).
149149
*
150150
*/
151151
@Test
152-
@DisplayName("create three different type of domains in Operator 4.0.8 and upgrade")
153-
void testInstallAndUpgradeOperatorFrom408() {
152+
@DisplayName("create three different type of domains in Operator 4.2.0 and upgrade")
153+
void testInstallAndUpgradeOperatorFrom420() {
154154
// install and verify operator
155-
installOldOperator("4.0.8", opNamespace,
155+
installOldOperator("4.2.0", opNamespace,
156156
miiDomainNamespace, domainOnPVNamespace, domainInImageNamespace);
157157
String[] domainTypes = {"modelInImage", "domainInImage", "domainOnPV"};
158158
for (String domainType : domainTypes) {
@@ -164,14 +164,14 @@ void testInstallAndUpgradeOperatorFrom408() {
164164
}
165165

166166
/**
167-
* Create 3 different types of domains with operator 4.1.2 (domain-on-pv, domain-in-image and model-in-image).
167+
* Create 3 different types of domains with operator 4.3.4 (domain-on-pv, domain-in-image and model-in-image).
168168
*
169169
*/
170170
@Test
171-
@DisplayName("create three different type of domains in Operator 4.1.2 and upgrade")
172-
void testInstallAndUpgradeOperatorFrom412() {
171+
@DisplayName("create three different type of domains in Operator 4.3.4 and upgrade")
172+
void testInstallAndUpgradeOperatorFrom434() {
173173
// install and verify operator
174-
installOldOperator("4.1.2", opNamespace,
174+
installOldOperator("4.3.4", opNamespace,
175175
miiDomainNamespace, domainOnPVNamespace, domainInImageNamespace);
176176
String[] domainTypes = {"modelInImage", "domainInImage", "domainOnPV"};
177177
for (String domainType : domainTypes) {

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

Lines changed: 17 additions & 22 deletions
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;
@@ -44,6 +45,7 @@
4445
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET_NAME;
4546
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
4647
import static oracle.weblogic.kubernetes.TestConstants.DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX;
48+
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_VERSION;
4749
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
4850
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
4951
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
@@ -193,24 +195,17 @@ void tearDown() {
193195
*/
194196
@Test
195197
@DisplayName("Upgrade Operator from 3.3.8 to current")
198+
@Disabled
196199
void testOperatorFmwUpgradeFrom338ToCurrent() {
197200
installAndUpgradeOperator("3.3.8", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
198201
}
199202

200-
/**
201-
* Operator upgrade from 3.4.5 to current with a FMW Domain.
202-
*/
203-
@Test
204-
@DisplayName("Upgrade Operator from 3.4.5 to current")
205-
void testOperatorFmwUpgradeFrom345ToCurrent() {
206-
installAndUpgradeOperator("3.4.5", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
207-
}
208-
209203
/**
210204
* Operator upgrade from 3.4.6 to current with a FMW Domain.
211205
*/
212206
@Test
213207
@DisplayName("Upgrade Operator from 3.4.6 to current")
208+
@Disabled
214209
void testOperatorFmwUpgradeFrom346ToCurrent() {
215210
installAndUpgradeOperator("3.4.6", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
216211
}
@@ -225,32 +220,32 @@ void testOperatorFmwUpgradeFrom407ToCurrent() {
225220
}
226221

227222
/**
228-
* Operator upgrade from 4.0.8 to current with a FMW Domain.
223+
* Operator upgrade from 4.1.8 to current with a FMW Domain.
229224
*/
230225
@Test
231-
@DisplayName("Upgrade Operator from 4.0.8 to current")
232-
void testOperatorFmwUpgradeFrom408ToCurrent() {
233-
installAndUpgradeOperator("4.0.8", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
226+
@DisplayName("Upgrade Operator from 4.1.8 to current")
227+
void testOperatorFmwUpgradeFrom418ToCurrent() {
228+
installAndUpgradeOperator("4.1.8", DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
234229
}
235230

236231
/**
237-
* Operator upgrade from 4.1.0 to current with a FMW Domain.
232+
* Operator upgrade from 4.2.0 to current with a FMW Domain.
238233
*/
239234
@Test
240-
@DisplayName("Upgrade Operator from 4.1.0 to current")
241-
void testOperatorFmwUpgradeFrom410ToCurrent() {
242-
installAndUpgradeOperator("4.1.0", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
235+
@DisplayName("Upgrade Operator from 4.2.0 to current")
236+
void testOperatorFmwUpgradeFrom420ToCurrent() {
237+
installAndUpgradeOperator("4.2.0", DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
243238
}
244239

245240
/**
246-
* Operator upgrade from 4.1.1 to current with a FMW Domain.
241+
* Operator upgrade from 4.3.4 to current with a FMW Domain.
247242
*/
248243
@Test
249-
@DisplayName("Upgrade Operator from 4.1.1 to current")
250-
void testOperatorFmwUpgradeFrom411ToCurrent() {
251-
installAndUpgradeOperator("4.1.1", "v8", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
244+
@DisplayName("Upgrade Operator from 4.3.4 to current")
245+
void testOperatorFmwUpgradeFrom434ToCurrent() {
246+
installAndUpgradeOperator("4.3.4", DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
252247
}
253-
248+
254249
private void installAndUpgradeOperator(
255250
String operatorVersion, String domainVersion,
256251
String externalServiceNameSuffix) {

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -115,35 +115,35 @@ void beforeEach(@Namespaces(2) List<String> namespaces) {
115115
}
116116

117117
/**
118-
* Upgrade from Operator 4.0.9 to current with Istio enabled domain.
118+
* Upgrade from Operator 4.1.8 to current with Istio enabled domain.
119119
*/
120120
@Test
121-
@DisplayName("Upgrade 4.0.9 Istio Domain with Istio to current")
122-
void testOperatorWlsIstioDomainUpgradeFrom409ToCurrent() {
123-
logger.info("Starting testOperatorWlsIstioDomainUpgradeFrom409ToCurrent"
124-
+ " to upgrade Istio Image Domain with Istio with v9 schema to current");
125-
upgradeWlsIstioDomain("4.0.9");
121+
@DisplayName("Upgrade 4.1.8 Istio Domain with Istio to current")
122+
void testOperatorWlsIstioDomainUpgradeFrom418ToCurrent() {
123+
logger.info("Starting testOperatorWlsIstioDomainUpgradeFrom418ToCurrent"
124+
+ " to upgrade Istio Image Domain with Istio with v9 schema to current");
125+
upgradeWlsIstioDomain("4.1.8");
126126
}
127127

128128
/**
129-
* Upgrade from Operator 4.1.7 to current with Istio enabled domain.
129+
* Upgrade from Operator 4.2.20 to current with Istio enabled domain.
130130
*/
131131
@Test
132-
@DisplayName("Upgrade 4.1.7 Istio Domain(v9) with Istio to current")
133-
void testOperatorWlsIstioDomainUpgradeFrom417ToCurrent() {
134-
logger.info("Starting testOperatorWlsIstioDomainUpgradeFrom417ToCurrent"
135-
+ " to upgrade Istio Image Domain with Istio with v9 schema to current");
136-
upgradeWlsIstioDomain("4.1.7");
132+
@DisplayName("Upgrade 4.2.20 Istio Domain(v9) with Istio to current")
133+
void testOperatorWlsIstioDomainUpgradeFrom4220ToCurrent() {
134+
logger.info("Starting testOperatorWlsIstioDomainUpgradeFrom4220ToCurrent"
135+
+ " to upgrade Istio Image Domain with Istio with v9 schema to current");
136+
upgradeWlsIstioDomain("4.2.20");
137137
}
138138

139139
/**
140-
* Upgrade from Operator v4.2.6 to current with Istio enabled domain.
140+
* Upgrade from Operator v4.3.4 to current with Istio enabled domain.
141141
*/
142142
@Test
143-
@DisplayName("Upgrade 4.2.6 Istio Domain with Istio to current")
144-
void testOperatorWlsIstioDomainUpgradeFrom426ToCurrent() {
143+
@DisplayName("Upgrade 4.3.4 Istio Domain with Istio to current")
144+
void testOperatorWlsIstioDomainUpgradeFrom434ToCurrent() {
145145
logger.info("Starting test to upgrade Istio Image Domain with Istio with v9 schema to current");
146-
upgradeWlsIstioDomain("4.2.6");
146+
upgradeWlsIstioDomain("4.3.4");
147147
}
148148

149149
/**

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

Lines changed: 54 additions & 58 deletions
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.MethodOrderer;
4041
import org.junit.jupiter.api.Tag;
@@ -172,111 +173,106 @@ static void init() {
172173
logger = getLogger();
173174
}
174175

175-
/**
176-
* Operator upgrade from 4.0.9 to current with Mii domain in V8 schema.
177-
*/
178-
@Test
179-
@DisplayName("Upgrade Operator from 4.0.9 to current")
180-
void testOperatorUpgradeMiiDomainV8From409ToCurrent() {
181-
logger.info("Starting test testOperatorUpgradeMiiDomainV8From409ToCurrent with Mii domain v8 schema");
182-
installOperatorCreateMiiDomainAndUpgrade("4.0.9", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
183-
}
184176

185177
/**
186-
* Upgrade Operator from 4.0.10 to current with Auxiliary image domain, V9 schema.
178+
* Operator upgrade from 4.1.8 to current with Auxiliary Image Domain, V9 schema.
187179
*/
188180
@Test
189-
@DisplayName("Upgrade Operator from 4.0.10 to current")
190-
void testOperatorUpgradeAuxDomainV9From4010ToCurrent() {
191-
logger.info("Starting test testOperatorUpgradeAuxDomainV9From4010ToCurrent with Auxiliary domain v9 schema");
192-
installOperatorCreateAuxDomainAndUpgrade("4.0.10", DOMAIN_VERSION);
181+
@DisplayName("Upgrade Operator from 4.1.8 to current")
182+
void testOperatorUpgradeAuxDomainV9From418ToCurrent() {
183+
logger.info("Starting test testOperatorUpgradeAuxDomainV9From418ToCurrent to upgrade Auxiliary Domain "
184+
+ "with V9 schema to current");
185+
installOperatorCreateAuxDomainAndUpgrade("4.1.8", DOMAIN_VERSION);
193186
}
194187

195188
/**
196-
* Upgrade Operator from 4.1.7 to current with Mii domain in V8 schema.
189+
* Operator upgrade from 4.2.20 to current with Auxiliary Image Domain, V9 schema.
197190
*/
198191
@Test
199-
@DisplayName("Upgrade Operator from 4.1.7 to current")
200-
void testOperatorUpgradeMiiDomainV8From417ToCurrent() {
201-
logger.info("Starting test testOperatorUpgradeMiiDomainV8From417ToCurrent with Mii domain v8 schema");
202-
installOperatorCreateMiiDomainAndUpgrade("4.1.7", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
192+
@DisplayName("Upgrade Operator from 4.2.20 to current")
193+
void testOperatorUpgradeAuxDomainV9From4220ToCurrent() {
194+
logger.info("Starting test testOperatorUpgradeAuxDomainV9From4220ToCurrent to upgrade Domain with "
195+
+ "Auxiliary Image with v9 schema to current");
196+
installOperatorCreateAuxDomainAndUpgrade("4.2.20", DOMAIN_VERSION);
203197
}
204198

205199
/**
206-
* Operator upgrade from 4.1.8 to current with Auxiliary Image Domain, V9 schema.
200+
* Operator upgrade from 4.3.4 to current with Auxiliary Image Domain, V9 schema.
207201
*/
208202
@Test
209-
@DisplayName("Upgrade Operator from 4.1.8 to current")
210-
void testOperatorUpgradeAuxDomainV9From418ToCurrent() {
211-
logger.info("Starting test testOperatorUpgradeAuxDomainV9From418ToCurrent to upgrade Auxiliary Domain "
212-
+ "with V9 schema to current");
213-
installOperatorCreateAuxDomainAndUpgrade("4.1.8", DOMAIN_VERSION);
203+
@DisplayName("Upgrade Operator from 4.3.4 to current")
204+
void testOperatorUpgradeAuxDomainV9From434ToCurrent() {
205+
logger.info("Starting test testOperatorUpgradeAuxDomainV9From434ToCurrent to upgrade Domain with "
206+
+ "Auxiliary Image with v9 schema to current");
207+
installOperatorCreateAuxDomainAndUpgrade("4.3.4", DOMAIN_VERSION);
214208
}
215209

210+
216211

217212
/**
218-
* Operator upgrade from 4.2.15 to current with DPV domain in V9 schema.
213+
* Operator upgrade from 4.1.8 to current with DPV domain in V9 schema.
219214
*/
220215
@Test
221-
@DisplayName("Upgrade Operator from 4.2.15 to current")
222-
void testOperatorUpgradeDomainOnPVV9From4215ToCurrent() {
223-
logger.info("Starting test testOperatorUpgradeDomainOnPVV9From4215ToCurrent, domain v9 schema");
224-
installOperatorCreatesPvPvcWlsDomainAndUpgrade("4.2.15");
216+
@DisplayName("Upgrade Operator from 4.1.8 to current")
217+
void testOperatorUpgradeDomainOnPVV9From418ToCurrent() {
218+
logger.info("Starting test testOperatorUpgradeDomainOnPVV9From418ToCurrent, domain v9 schema");
219+
installOperatorCreatesPvPvcWlsDomainAndUpgrade("4.1.8");
225220
}
226221

227222
/**
228-
* Operator upgrade from 4.2.14 to current with DPV domain in V9 schema.
223+
* Operator upgrade from 4.2.20 to current with DPV domain in V9 schema.
229224
*/
230225
@Test
231-
@DisplayName("Upgrade Operator from 4.2.14 to current")
232-
void testOperatorUpgradeDomainOnPVV9From4214ToCurrent() {
233-
logger.info("Starting test testOperatorUpgradeDomainOnPVV9From4214ToCurrent, domain v9 schema");
234-
installOperatorCreatesPvPvcWlsDomainAndUpgrade("4.2.14");
226+
@DisplayName("Upgrade Operator from 4.2.20 to current")
227+
void testOperatorUpgradeDomainOnPVV9From4220ToCurrent() {
228+
logger.info("Starting test testOperatorUpgradeDomainOnPVV9From4220ToCurrent, domain v9 schema");
229+
installOperatorCreatesPvPvcWlsDomainAndUpgrade("4.2.20");
235230
}
236231

237232
/**
238-
* Operator upgrade from 4.2.14 to current with Auxiliary Image Domain, V9 schema.
233+
* Operator upgrade from 4.3.4 to current with DPV domain in V9 schema.
239234
*/
240235
@Test
241-
@DisplayName("Upgrade Operator from 4.2.14 to current")
242-
void testOperatorUpgradeAuxDomainV9From4214ToCurrent() {
243-
logger.info("Starting test testOperatorUpgradeAuxDomainV9From4214ToCurrent to upgrade Domain with "
244-
+ "Auxiliary Image with v9 schema to current");
245-
installOperatorCreateAuxDomainAndUpgrade("4.2.14", DOMAIN_VERSION);
236+
@DisplayName("Upgrade Operator from 4.3.4 to current")
237+
void testOperatorUpgradeDomainOnPVV9From434ToCurrent() {
238+
logger.info("Starting test testOperatorUpgradeDomainOnPVV9From434ToCurrent, domain v9 schema");
239+
installOperatorCreatesPvPvcWlsDomainAndUpgrade("4.3.4");
246240
}
247241

248242
/**
249-
* Operator upgrade from 4.2.12 to current with Model in Image Domain, V8 schema.
243+
* Operator upgrade from 4.0.9 to current with Mii domain in V8 schema.
250244
*/
251245
@Test
252-
@DisplayName("Upgrade Operator from 4.2.12 to current")
253-
void testOperatorUpgradeMiiDomainV8From4212ToCurrent() {
254-
logger.info("Starting test testOperatorUpgradeMiiDomainV8From4212ToCurrent to upgrade Domain with "
255-
+ "Auxiliary Image with v8 schema to current");
256-
installOperatorCreateMiiDomainAndUpgrade("4.2.12", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
246+
@DisplayName("Upgrade Operator from 4.0.9 to current")
247+
@Disabled
248+
void testOperatorUpgradeMiiDomainV8From409ToCurrent() {
249+
logger.info("Starting test testOperatorUpgradeMiiDomainV8From409ToCurrent with Mii domain v8 schema");
250+
installOperatorCreateMiiDomainAndUpgrade("4.0.9", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
257251
}
258252

259253
/**
260-
* Operator upgrade from 4.1.8 to current with DPV domain in V9 schema.
254+
* Upgrade Operator from 4.1.7 to current with Mii domain in V8 schema.
261255
*/
262256
@Test
263-
@DisplayName("Upgrade Operator from 4.1.8 to current")
264-
void testOperatorUpgradeDomainOnPVV9From418ToCurrent() {
265-
logger.info("Starting test testOperatorUpgradeDomainOnPVV9From418ToCurrent, domain v9 schema");
266-
installOperatorCreatesPvPvcWlsDomainAndUpgrade("4.1.8");
257+
@DisplayName("Upgrade Operator from 4.1.7 to current")
258+
@Disabled
259+
void testOperatorUpgradeMiiDomainV8From417ToCurrent() {
260+
logger.info("Starting test testOperatorUpgradeMiiDomainV8From417ToCurrent with Mii domain v8 schema");
261+
installOperatorCreateMiiDomainAndUpgrade("4.1.7", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
267262
}
268263

269264
/**
270-
* Operator upgrade from 4.1.7 to current with DPV domain in V9 schema.
265+
* Operator upgrade from 4.2.12 to current with Model in Image Domain, V8 schema.
271266
*/
272267
@Test
273-
@DisplayName("Upgrade Operator from 4.1.7 to current")
274-
void testOperatorUpgradeDomainOnPVV9From417ToCurrent() {
275-
logger.info("Starting test testOperatorUpgradeDomainOnPVV9From417ToCurrent, domain v9 schema");
276-
installOperatorCreatesPvPvcWlsDomainAndUpgrade("4.1.7");
268+
@DisplayName("Upgrade Operator from 4.2.12 to current")
269+
@Disabled
270+
void testOperatorUpgradeMiiDomainV8From4212ToCurrent() {
271+
logger.info("Starting test testOperatorUpgradeMiiDomainV8From4212ToCurrent to upgrade Domain with "
272+
+ "Auxiliary Image with v8 schema to current");
273+
installOperatorCreateMiiDomainAndUpgrade("4.2.12", OLD_DOMAIN_VERSION, DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX);
277274
}
278275

279-
280276
/**
281277
* Cleanup Kubernetes artifacts in the namespaces used by the test and
282278
* delete CRD.

0 commit comments

Comments
 (0)