Skip to content

Commit 49070ae

Browse files
committed
Merge branch 'xc-122680-42' into 'release/4.2'
workaround OWLS-122679 - do not create WDT base image in InitializationTask in crio-pipeline and OCNE See merge request weblogic-cloud/weblogic-kubernetes-operator!4840
2 parents cd25b06 + 8ab8383 commit 49070ae

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/extensions/InitializationTasks.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public void beforeAll(ExtensionContext context) {
240240

241241
logger.info("Build/Check wdt-basic image with tag {0}", WDT_BASIC_IMAGE_TAG);
242242
// build WDT basic image if does not exits
243-
if (! imageExists(WDT_BASIC_IMAGE_NAME, WDT_BASIC_IMAGE_TAG)) {
243+
if (!imageExists(WDT_BASIC_IMAGE_NAME, WDT_BASIC_IMAGE_TAG) && !CRIO && !OCNE) {
244244
logger.info("Building wdt-basic image {0}", wdtBasicImage);
245245
testUntil(
246246
withVeryLongRetryPolicy,
@@ -249,7 +249,7 @@ public void beforeAll(ExtensionContext context) {
249249
logger,
250250
"createBasicImage to be successful");
251251
} else {
252-
logger.info("!!!! domain image {0} exists !!!!", wdtBasicImage);
252+
logger.info("!!!! domain image {0} exists !!!! or env is not OCNE based", wdtBasicImage);
253253
}
254254

255255
/* Check image exists using WLSIMG_BUILDER images | grep image tag.
@@ -261,8 +261,10 @@ public void beforeAll(ExtensionContext context) {
261261
assertTrue(doesImageExist(MII_BASIC_IMAGE_TAG),
262262
String.format("Image %s doesn't exist", miiBasicImage));
263263

264-
assertTrue(doesImageExist(WDT_BASIC_IMAGE_TAG),
264+
if (!CRIO && !OCNE) {
265+
assertTrue(doesImageExist(WDT_BASIC_IMAGE_TAG),
265266
String.format("Image %s doesn't exist", wdtBasicImage));
267+
}
266268

267269
logger.info(WLSIMG_BUILDER + " login");
268270
testUntil(withVeryLongRetryPolicy,
@@ -280,7 +282,9 @@ public void beforeAll(ExtensionContext context) {
280282
// add images only if SKIP_BUILD_IMAGES_IF_EXISTS is not set
281283
if (!SKIP_BUILD_IMAGES_IF_EXISTS) {
282284
images.add(miiBasicImage);
283-
images.add(wdtBasicImage);
285+
if (!CRIO && !OCNE) {
286+
images.add(wdtBasicImage);
287+
}
284288
}
285289

286290
for (String image : images) {

0 commit comments

Comments
 (0)