Skip to content

Commit 816ce33

Browse files
committed
Merge branch 'xc-111994-41' into 'release/4.1'
backport Fix ItFmwDomainOnPVSample and ItWlsDomainOnPVSample permission issue when creating domains to release/4.1 See merge request weblogic-cloud/weblogic-kubernetes-operator!4422
2 parents 3e07d28 + f8e5ee0 commit 816ce33

File tree

3 files changed

+42
-0
lines changed

3 files changed

+42
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
5151
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
5252
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
53+
import static oracle.weblogic.kubernetes.utils.SampleUtils.createPVHostPathAndChangePermissionInKindCluster;
5354
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
5455
import static org.junit.jupiter.api.Assertions.assertNotNull;
5556
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -232,6 +233,7 @@ public void testInitialMain() {
232233
if (KIND_REPO != null) {
233234
logger.info("loading image {0} to kind", FMWINFRA_IMAGE_TO_USE_IN_SPEC);
234235
imagePush(FMWINFRA_IMAGE_TO_USE_IN_SPEC);
236+
createPVHostPathAndChangePermissionInKindCluster("/shared", envMap);
235237
}
236238

237239
execTestScriptAndAssertSuccess("-initial-main", "Failed to run -initial-main");

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
4949
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
5050
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
51+
import static oracle.weblogic.kubernetes.utils.SampleUtils.createPVHostPathAndChangePermissionInKindCluster;
5152
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
5253
import static org.junit.jupiter.api.Assertions.assertNotNull;
5354
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -191,6 +192,7 @@ public void testInitialMain() {
191192
if (KIND_REPO != null) {
192193
logger.info("loading image {0} to kind", WEBLOGIC_IMAGE_TO_USE_IN_SPEC);
193194
imagePush(WEBLOGIC_IMAGE_TO_USE_IN_SPEC);
195+
createPVHostPathAndChangePermissionInKindCluster("/shared", envMap);
194196
}
195197

196198
execTestScriptAndAssertSuccess("-initial-main", "Failed to run -initial-main");
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Copyright (c) 2023, 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.utils;
5+
6+
import java.util.Map;
7+
8+
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
9+
import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
10+
11+
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER_DEFAULT;
12+
13+
/**
14+
* The Sample utility class for tests.
15+
*/
16+
public class SampleUtils {
17+
18+
/**
19+
* Create PV hostPath and change permission in Kind cluster.
20+
* @param hostPath - hostPath for PV
21+
* @param envMap - envMap for running the docker command
22+
*/
23+
public static void createPVHostPathAndChangePermissionInKindCluster(String hostPath, Map<String, String> envMap) {
24+
String command = WLSIMG_BUILDER_DEFAULT
25+
+ " exec kind-worker sh -c \"mkdir "
26+
+ hostPath
27+
+ " && chmod g+w "
28+
+ hostPath
29+
+ "\"";
30+
31+
Command.withParams(
32+
new CommandParams()
33+
.command(command)
34+
.env(envMap)
35+
.redirect(true)
36+
).execute();
37+
}
38+
}

0 commit comments

Comments
 (0)