Skip to content

Commit 346f0e0

Browse files
committed
use krun.sh instead of job.sh
1 parent 1b4e345 commit 346f0e0

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ protected void createPv() throws Exception {
938938
pvMap.values().removeIf(Objects::isNull);
939939

940940
// k8s job mounts PVROOT /scratch/<usr>/wl_k8s_test_results to /scratch, create PV/PVC
941-
new PersistentVolume("/scratch/acceptance_test_pv/persistentVolume-" + domainUid, pvMap);
941+
new PersistentVolume("acceptance_test_pv/persistentVolume-" + domainUid, pvMap);
942942

943943
String cmd =
944944
BaseTest.getProjectRoot()

integration-tests/src/test/java/oracle/kubernetes/operator/utils/PersistentVolume.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public PersistentVolume(String dirPath, Map pvMap) throws Exception {
2323
this.pvMap = pvMap;
2424

2525
String cmd =
26-
BaseTest.getProjectRoot()
27-
+ "/src/integration-tests/bash/job.sh \"mkdir -m 777 -p "
28-
+ dirPath
29-
+ "\"";
26+
BaseTest.getProjectRoot()
27+
+ "/src/integration-tests/bash/krun.sh -m "+BaseTest.getPvRoot()+":/sharedparent -c 'mkdir -m 777 -p /sharedparent/"
28+
+ dirPath
29+
+ "'";
3030

3131
ExecResult result = ExecCommand.exec(cmd);
3232
if (result.exitValue() != 0) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ function get_wlthint3client_from_image {
175175
docker rm -v $id
176176

177177
}
178-
export OCR_SERVER=container-registry.oracle.com
178+
export OCR_SERVER="${OCR_SERVER:-container-registry.oracle.com}"
179179
export WLS_IMAGE_URI=/middleware/weblogic
180180
export SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
181181
export PROJECT_ROOT="$SCRIPTPATH/../../../.."

0 commit comments

Comments
 (0)