Skip to content

Commit 50c0128

Browse files
committed
test: stabilize jindo secret e2e checks
Signed-off-by: CAICAIIs <3360776475@qq.com>
1 parent ccf1dcc commit 50c0128

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

test/gha-e2e/jindo/job.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ spec:
2020
- |
2121
set -eu
2222
for i in $(seq 1 24); do
23-
if test -n "$(ls /data 2>/dev/null)" && test "$(cat /data/testfile 2>/dev/null)" = "helloworld"; then
23+
found_file="$(find /data -maxdepth 3 -type f -name testfile 2>/dev/null | head -n 1 || true)"
24+
if test -n "$found_file" && test "$(cat "$found_file" 2>/dev/null)" = "helloworld"; then
25+
echo "verified single-mount data from $found_file"
2426
exit 0
2527
fi
2628
sleep 5
2729
done
2830
ls -al /data >&2 || true
29-
cat /data/testfile >&2 || true
31+
find /data -maxdepth 3 \( -type d -o -type f \) >&2 || true
3032
exit 1
3133
volumeMounts:
3234
- mountPath: /data

test/gha-e2e/jindo/test.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ EOF
416416
function delete_warmup_pod() {
417417
dataset_name=$1
418418
kubectl delete pod "${dataset_name}-warmup" --ignore-not-found >/dev/null 2>&1 || true
419+
kubectl wait --for=delete --timeout=180s pod/"${dataset_name}-warmup" >/dev/null 2>&1 || true
419420
}
420421

421422
function wait_warmup_ready() {
@@ -472,13 +473,9 @@ function run_scenario() {
472473
syslog "Running scenario: $scenario_name"
473474
create_dataset $dataset_file $dataset_name
474475
wait_dataset_bound $dataset_name
475-
if [[ "$dataset_name" == "$multi_oss_dataset_name" ]]; then
476-
create_warmup_pod $dataset_name
477-
wait_runtime_stable $dataset_name
478-
wait_warmup_ready $dataset_name
479-
else
480-
wait_runtime_components_ready $dataset_name
481-
fi
476+
create_warmup_pod $dataset_name
477+
wait_runtime_stable $dataset_name
478+
wait_warmup_ready $dataset_name
482479
create_job $job_file $job_name
483480
wait_job_completed $job_name
484481
cleanup_scenario $dataset_file $dataset_name $job_file

0 commit comments

Comments
 (0)