Skip to content

Commit bcb71af

Browse files
committed
Fix run.sh
1 parent 1cbd24a commit bcb71af

File tree

1 file changed

+5
-5
lines changed
  • src/integration-tests/bash

1 file changed

+5
-5
lines changed

src/integration-tests/bash/run.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ function run_create_domain_job {
706706
trace "WLS_JAVA_OPTIONS = \"$WLS_JAVA_OPTIONS\""
707707

708708
local PV="pv"
709-
local PV_DIR="persistentVolume-${DOMAIN_UID}"
709+
local STORAGE_DIR="persistentVolume-${DOMAIN_UID}"
710710

711711
trace "Create $DOMAIN_UID in $NAMESPACE namespace "
712712

@@ -747,7 +747,7 @@ function run_create_domain_job {
747747
# Customize more configuration
748748
sed -i -e "s/^persistenceVolumeName:.*/persistenceVolumeName: ${PV}/" $inputs
749749
sed -i -e "s/^persistenceVolumeClaimName:.*/persistenceVolumeClaimName: $PV-claim/" $inputs
750-
sed -i -e "s;^persistencePath:.*;persistencePath: $PV_ROOT/acceptance_test_pv/$PV_DIR;" $inputs
750+
sed -i -e "s;^weblogicDomainStoragePath:.*;weblogicDomainStoragePath: $PV_ROOT/acceptance_test_pv/$STORAGE_DIR;" $inputs
751751
sed -i -e "s/^domainUID:.*/domainUID: $DOMAIN_UID/" $inputs
752752
sed -i -e "s/^clusterName:.*/clusterName: $WL_CLUSTER_NAME/" $inputs
753753
sed -i -e "s/^namespace:.*/namespace: $NAMESPACE/" $inputs
@@ -762,7 +762,7 @@ function run_create_domain_job {
762762
sed -i -e "s|#weblogicImagePullSecretName:.*|weblogicImagePullSecretName: ${WEBLOGIC_IMAGE_PULL_SECRET_NAME}|g" $inputs
763763
fi
764764
sed -i -e "s/^loadBalancerWebPort:.*/loadBalancerWebPort: $LOAD_BALANCER_WEB_PORT/" $inputs
765-
sed -i -e "s/^loadBalancerDashboardPort:.*/loadBalancerAdminPort: $LOAD_BALANCER_DASHBOARD_PORT/" $inputs
765+
sed -i -e "s/^loadBalancerDashboardPort:.*/loadBalancerDashboardPort: $LOAD_BALANCER_DASHBOARD_PORT/" $inputs
766766
sed -i -e "s/^javaOptions:.*/javaOptions: $WLS_JAVA_OPTIONS/" $inputs
767767
sed -i -e "s/^startupControl:.*/startupControl: $STARTUP_CONTROL/" $inputs
768768

@@ -772,11 +772,11 @@ function run_create_domain_job {
772772
fi
773773

774774
local outfile="${tmp_dir}/mkdir_physical_nfs.out"
775-
trace "Use a job to create the k8s host directory \"$PV_ROOT/acceptance_test_pv/$PV_DIR\" that we will use for the domain's persistent volume, see \"$outfile\" for job tracing."
775+
trace "Use a job to create the k8s host directory \"$PV_ROOT/acceptance_test_pv/$STORAGE_DIR\" that we will use for the domain's persistent volume, see \"$outfile\" for job tracing."
776776

777777
# Note that the job.sh job mounts PV_ROOT to /scratch and runs as UID 1000,
778778
# so PV_ROOT must already exist and have 777 or UID=1000 permissions.
779-
$SCRIPTPATH/job.sh "mkdir -p /scratch/acceptance_test_pv/$PV_DIR" > ${outfile} 2>&1
779+
$SCRIPTPATH/job.sh "mkdir -p /scratch/acceptance_test_pv/$STORAGE_DIR" > ${outfile} 2>&1
780780
if [ "$?" = "0" ]; then
781781
cat ${outfile} | sed 's/^/+/g'
782782
trace Job complete. Directory created on k8s cluster.

0 commit comments

Comments
 (0)