Skip to content

Commit 704b4db

Browse files
authored
Fix for slim image and domain path (#3064)
* Fix domain path Disable if WEBLOGIC_SLIM image fix adminCredentialsVerification with adminSvcExtHost set for OKD * disable test if WEBLOGIC_SLIM system property is true * use annotations to disable tests on slim image
1 parent 7d8e141 commit 704b4db

File tree

5 files changed

+48
-7
lines changed

5 files changed

+48
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ void testCreateMiiDomain() {
285285
logger.info("WebLogic console is accessible thru default service");
286286
} else {
287287
logger.info("Checking Rest API management console in WebLogic slim image");
288-
verifyCredentials(adminServerPodName, domainNamespace,
288+
verifyCredentials(adminSvcExtHost, adminServerPodName, domainNamespace,
289289
ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, true);
290290
}
291291
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.List;
88

99
import oracle.weblogic.domain.Domain;
10+
import oracle.weblogic.kubernetes.annotations.DisabledOnSlimImage;
1011
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
1112
import oracle.weblogic.kubernetes.annotations.Namespaces;
1213
import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -23,7 +24,6 @@
2324
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME;
2425
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
2526
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
26-
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
2727
import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
2828
import static oracle.weblogic.kubernetes.assertions.TestAssertions.adminNodePortAccessible;
2929
import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createMiiDomainAndVerify;
@@ -38,7 +38,6 @@
3838
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
3939
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
4040
import static org.junit.jupiter.api.Assertions.assertNotNull;
41-
import static org.junit.jupiter.api.Assumptions.assumeFalse;
4241

4342
/**
4443
* The test class creates WebLogic domains with three models.
@@ -111,9 +110,8 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
111110
+ "verify admin console login using admin node port.")
112111
@ValueSource(strings = {"modelInImage", "domainInImage", "domainOnPV"})
113112
@Tag("gate")
113+
@DisabledOnSlimImage
114114
void testScaleClustersAndAdminConsoleLogin(String domainType) {
115-
116-
assumeFalse(WEBLOGIC_SLIM, "Skipping the Console Test for slim image");
117115
Domain domain = createDomainBasedOnDomainType(domainType);
118116

119117
// get the domain properties

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,8 @@ void testDataHomeOverrideDomainOnPV() {
610610
Domain domainOnPV = createOrStartDomainBasedOnDomainType("domainOnPV");
611611
String domainUid = domainOnPV.getSpec().getDomainUid();
612612
String domainNamespace = domainOnPV.getMetadata().getNamespace();
613+
614+
String uniquePath = "/u01/shared/" + domainNamespace + "/domains/" + domainUid;
613615

614616
// check in admin server pod, there is a data file for JMS server created in /u01/oracle/customFileStore
615617
String dataFileToCheck = "/u01/oracle/customFileStore/FILESTORE-0000000.DAT";
@@ -618,7 +620,7 @@ void testDataHomeOverrideDomainOnPV() {
618620

619621
// check in admin server pod, the default admin server data file is in default data store
620622
String defaultAdminDataFile =
621-
"/u01/shared/domains/" + domainUid + "/servers/admin-server/data/store/default/_WLS_ADMIN-SERVER000000.DAT";
623+
uniquePath + "/servers/admin-server/data/store/default/_WLS_ADMIN-SERVER000000.DAT";
622624
waitForFileExistsInPod(domainNamespace, adminServerPodName, defaultAdminDataFile);
623625

624626
// check in managed server pod, there is no custom data file for JMS is created
@@ -632,7 +634,7 @@ void testDataHomeOverrideDomainOnPV() {
632634
String.format("found file %s in pod %s in namespace %s, expect not exist",
633635
customDataFile, managedServerPodName, domainNamespace));
634636

635-
String defaultMSDataFile = "/u01/shared/domains/" + domainUid + "/servers/managed-server" + i
637+
String defaultMSDataFile = uniquePath + "/servers/managed-server" + i
636638
+ "/data/store/default/_WLS_MANAGED-SERVER" + i + "000000.DAT";
637639
waitForFileExistsInPod(domainNamespace, managedServerPodName, defaultMSDataFile);
638640
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright (c) 2022, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
package oracle.weblogic.kubernetes.annotations;
5+
6+
import java.lang.annotation.ElementType;
7+
import java.lang.annotation.Retention;
8+
import java.lang.annotation.RetentionPolicy;
9+
import java.lang.annotation.Target;
10+
11+
import oracle.weblogic.kubernetes.extensions.DisabledOnSlimImageCondition;
12+
import org.junit.jupiter.api.extension.ExtendWith;
13+
14+
@Target({ElementType.TYPE, ElementType.METHOD})
15+
@Retention(RetentionPolicy.RUNTIME)
16+
@ExtendWith(DisabledOnSlimImageCondition.class)
17+
public @interface DisabledOnSlimImage {
18+
19+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright (c) 2022, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
4+
package oracle.weblogic.kubernetes.extensions;
5+
6+
import org.junit.jupiter.api.extension.ConditionEvaluationResult;
7+
import org.junit.jupiter.api.extension.ExecutionCondition;
8+
import org.junit.jupiter.api.extension.ExtensionContext;
9+
10+
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
11+
12+
public class DisabledOnSlimImageCondition implements ExecutionCondition {
13+
14+
@Override
15+
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
16+
if (WEBLOGIC_SLIM) {
17+
return ConditionEvaluationResult.disabled("Test disabled on WebLogic slim image");
18+
} else {
19+
return ConditionEvaluationResult.enabled("Test enabled on full WebLogic image");
20+
}
21+
}
22+
}

0 commit comments

Comments
 (0)