Skip to content

Commit 9ea656a

Browse files
authored
skip ItExternalLbTunneling ItExternalNodePortService for slim image (#3075)
1 parent 38f4655 commit 9ea656a

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
2929
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
3030
import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
31+
import oracle.weblogic.kubernetes.annotations.DisabledOnSlimImage;
3132
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
3233
import oracle.weblogic.kubernetes.annotations.Namespaces;
3334
import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -54,7 +55,6 @@
5455
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
5556
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
5657
import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_RELEASE_NAME;
57-
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
5858
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
5959
import static oracle.weblogic.kubernetes.actions.TestActions.createDomainCustomResource;
6060
import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
@@ -86,7 +86,6 @@
8686
import static org.junit.jupiter.api.Assertions.assertNotEquals;
8787
import static org.junit.jupiter.api.Assertions.assertNotNull;
8888
import static org.junit.jupiter.api.Assertions.assertTrue;
89-
import static org.junit.jupiter.api.Assumptions.assumeFalse;
9089

9190
/**
9291
* The use case described in this class verifies that an external RMI client
@@ -108,6 +107,7 @@
108107

109108
@DisplayName("Test external RMI access through loadbalncer tunneling")
110109
@IntegrationTest
110+
@DisabledOnSlimImage
111111
class ItExternalLbTunneling {
112112

113113
private static String opNamespace = null;
@@ -252,7 +252,6 @@ public void beforeEach() {
252252
@DisplayName("Verify RMI access to WLS through Traefik LoadBalancer")
253253
void testExternalRmiAccessThruTraefik() {
254254

255-
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
256255
// Build the standalone JMS Client to send and receive messages
257256
buildClient();
258257
buildClientOnPod();
@@ -311,8 +310,6 @@ void testExternalRmiAccessThruTraefik() {
311310
@DisplayName("Verify tls RMI access WLS through Traefik loadBalancer")
312311
void testExternalRmiAccessThruTraefikHttpsTunneling() {
313312

314-
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
315-
316313
// Build the standalone JMS Client to send and receive messages
317314
buildClient();
318315

@@ -361,9 +358,6 @@ void testExternalRmiAccessThruTraefikHttpsTunneling() {
361358
@DisplayName("Verify RMI access WLS through Route in OKD ")
362359
void testExternalRmiAccessThruRouteHttpTunneling() {
363360

364-
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
365-
logger.info("Installing Nginx controller using helm");
366-
367361
// Build the standalone JMS Client to send and receive messages
368362
buildClient();
369363
buildClientOnPod();
@@ -393,8 +387,6 @@ void testExternalRmiAccessThruRouteHttpTunneling() {
393387
@DisplayName("Verify tls RMI access WLS through Route in OKD ")
394388
void testExternalRmiAccessThruRouteHttpsTunneling() {
395389

396-
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
397-
398390
// Build the standalone JMS Client to send and receive messages
399391
buildClient();
400392

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import oracle.weblogic.domain.DomainSpec;
2525
import oracle.weblogic.domain.Model;
2626
import oracle.weblogic.domain.ServerPod;
27+
import oracle.weblogic.kubernetes.annotations.DisabledOnSlimImage;
2728
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
2829
import oracle.weblogic.kubernetes.annotations.Namespaces;
2930
import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -47,7 +48,6 @@
4748
import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME;
4849
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
4950
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
50-
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
5151
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
5252
import static oracle.weblogic.kubernetes.actions.TestActions.createDomainCustomResource;
5353
import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
@@ -73,7 +73,6 @@
7373
import static org.junit.jupiter.api.Assertions.assertNotEquals;
7474
import static org.junit.jupiter.api.Assertions.assertNotNull;
7575
import static org.junit.jupiter.api.Assertions.assertTrue;
76-
import static org.junit.jupiter.api.Assumptions.assumeFalse;
7776

7877
/**
7978
* The use case verifies external RMI client access to WebLogic cluster.
@@ -92,6 +91,7 @@
9291
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
9392
@DisplayName("Test external RMI access through NodePort tunneling")
9493
@IntegrationTest
94+
@DisabledOnSlimImage
9595
class ItExternalNodePortService {
9696

9797
private static String opNamespace = null;
@@ -207,7 +207,6 @@ public void beforeEach() {
207207
@DisplayName("Verify RMI access to WLS through NodePort Service")
208208
void testExternalRmiAccessThruNodePortService() {
209209

210-
assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
211210
// Build the standalone JMS Client to send and receive messages
212211
buildClient();
213212
buildClientOnPod();

0 commit comments

Comments
 (0)