Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ void testCreateMiiDomain() {
logger.info("WebLogic console is accessible thru default service");
} else {
logger.info("Checking Rest API management console in WebLogic slim image");
verifyCredentials(adminServerPodName, domainNamespace,
verifyCredentials(adminSvcExtHost, adminServerPodName, domainNamespace,
ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, true);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.List;

import oracle.weblogic.domain.Domain;
import oracle.weblogic.kubernetes.annotations.DisabledOnSlimImage;
import oracle.weblogic.kubernetes.annotations.IntegrationTest;
import oracle.weblogic.kubernetes.annotations.Namespaces;
import oracle.weblogic.kubernetes.logging.LoggingFacade;
Expand All @@ -23,7 +24,6 @@
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME;
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
import static oracle.weblogic.kubernetes.assertions.TestAssertions.adminNodePortAccessible;
import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createMiiDomainAndVerify;
Expand All @@ -38,7 +38,6 @@
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assumptions.assumeFalse;

/**
* The test class creates WebLogic domains with three models.
Expand Down Expand Up @@ -111,9 +110,8 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
+ "verify admin console login using admin node port.")
@ValueSource(strings = {"modelInImage", "domainInImage", "domainOnPV"})
@Tag("gate")
@DisabledOnSlimImage
void testScaleClustersAndAdminConsoleLogin(String domainType) {

assumeFalse(WEBLOGIC_SLIM, "Skipping the Console Test for slim image");
Domain domain = createDomainBasedOnDomainType(domainType);

// get the domain properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,8 @@ void testDataHomeOverrideDomainOnPV() {
Domain domainOnPV = createOrStartDomainBasedOnDomainType("domainOnPV");
String domainUid = domainOnPV.getSpec().getDomainUid();
String domainNamespace = domainOnPV.getMetadata().getNamespace();

String uniquePath = "/u01/shared/" + domainNamespace + "/domains/" + domainUid;

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

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

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

String defaultMSDataFile = "/u01/shared/domains/" + domainUid + "/servers/managed-server" + i
String defaultMSDataFile = uniquePath + "/servers/managed-server" + i
+ "/data/store/default/_WLS_MANAGED-SERVER" + i + "000000.DAT";
waitForFileExistsInPod(domainNamespace, managedServerPodName, defaultMSDataFile);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright (c) 2022, Oracle and/or its affiliates.
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

package oracle.weblogic.kubernetes.annotations;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import oracle.weblogic.kubernetes.extensions.DisabledOnSlimImageCondition;
import org.junit.jupiter.api.extension.ExtendWith;

@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@ExtendWith(DisabledOnSlimImageCondition.class)
public @interface DisabledOnSlimImage {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright (c) 2022, Oracle and/or its affiliates.
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

package oracle.weblogic.kubernetes.extensions;

import org.junit.jupiter.api.extension.ConditionEvaluationResult;
import org.junit.jupiter.api.extension.ExecutionCondition;
import org.junit.jupiter.api.extension.ExtensionContext;

import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;

public class DisabledOnSlimImageCondition implements ExecutionCondition {

@Override
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
if (WEBLOGIC_SLIM) {
return ConditionEvaluationResult.disabled("Test disabled on WebLogic slim image");
} else {
return ConditionEvaluationResult.enabled("Test enabled on full WebLogic image");
}
}
}