Skip to content

Commit 5211b71

Browse files
committed
skip jms test for slim image
1 parent 1c084d5 commit 5211b71

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class BaseTest {
3131
public static final String TESTWEBAPP = "testwebapp";
3232
public static final String TESTWSAPP = "testwsapp";
3333
public static final String TESTWSSERVICE = "TestWsApp";
34+
public static final String PS4_SLIM_TAG = "12.2.1.4-slim";
3435

3536
// property file used to customize operator properties for operator inputs yaml
3637

integration-tests/src/test/java/oracle/kubernetes/operator/ItOperator.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,9 @@ public void testAutoAndCustomSitConfigOverrides() throws Exception {
468468
domain11 = TestUtils.createDomain(domainMap);
469469
domain11.verifyDomainCreated();
470470
testBasicUseCases(domain11);
471-
testAdminT3ChannelWithJms(domain11);
471+
if(!getWeblogicImageTag().equalsIgnoreCase(PS4_SLIM_TAG)) {
472+
testAdminT3ChannelWithJms(domain11);
473+
}
472474
testCompletedSuccessfully = true;
473475

474476
} finally {

integration-tests/src/test/resources/setupenv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ else
315315
docker build --build-arg http_proxy=$http_proxy --build-arg https_proxy=$https_proxy --build-arg no_proxy=$no_proxy -t "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}" --build-arg VERSION=$JAR_VERSION --no-cache=true .
316316
docker tag "${IMAGE_NAME_OPERATOR}:${IMAGE_TAG_OPERATOR}" weblogic-kubernetes-operator:latest
317317

318-
if [ "$JRF_ENABLED" = false ]; then
318+
if [ "$JRF_ENABLED" = false ] && [ "$IMAGE_TAG_WEBLOGIC" != "12.2.1.4-slim"]; then
319319
get_wlthint3client_from_image
320320
fi
321321
fi

0 commit comments

Comments
 (0)