Skip to content

Commit 73bccb6

Browse files
committed
Remove an extra tmp dir from runpath for egg test
1 parent fd1d958 commit 73bccb6

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

ci/testkomodo.sh

+6-8
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ remove_one_week_old_temp_folders () {
5252
}
5353

5454

55-
make_run_path () {
55+
make_egg_runpath () {
5656
case "$1" in
5757
"azure")
5858
mkdir -p /lustre1/users/f_scout_ci/egg_tests
@@ -70,13 +70,11 @@ make_run_path () {
7070
run_everest_egg_test() {
7171

7272
# Need to copy the egg test to a directory that is accessible by all cluster members
73-
RUNNER_ROOT=$(make_run_path "$CI_RUNNER_LABEL")
74-
mkdir -p "$RUNNER_ROOT"
75-
RUNNER_TMP_DIR=$(mktemp -d -p "$RUNNER_ROOT")
76-
cp -r "${CI_SOURCE_ROOT}/test-data/everest/egg" "$RUNNER_TMP_DIR"
77-
chmod -R a+rx "$RUNNER_TMP_DIR"
78-
pushd "${RUNNER_TMP_DIR}/egg"
79-
echo "RUNNER_TMP_DIR: $RUNNER_TMP_DIR"
73+
EGG_RUNPATH=$(make_egg_runpath "$CI_RUNNER_LABEL")
74+
cp -r "${CI_SOURCE_ROOT}/test-data/everest/egg" "$EGG_RUNPATH"
75+
chmod -R a+rx "$EGG_RUNPATH"
76+
pushd "${EGG_RUNPATH}/egg"
77+
echo "EGG_RUNPATH: $EGG_RUNPATH"
8078

8179
disable_komodo
8280
# shellcheck source=/dev/null

0 commit comments

Comments
 (0)