From 72b2f2176c396e6dbbcb83ecd09398370fa25f7e Mon Sep 17 00:00:00 2001 From: ric-evans Date: Fri, 27 Sep 2024 12:12:00 -0500 Subject: [PATCH] refactoring test dirpaths - 2 --- .github/workflows/tests.yml | 16 ++++++++-------- resources/launch_scripts/local-scan.sh | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 81eb9b35a..719889896 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -232,7 +232,7 @@ jobs: - name: worker pilot \#1 stdout/stderr if: always() run: | - more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-1/pilot-1.out | cat + more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-1/pilot.out | cat - name: worker tasks \#1 stdouts/stderrs if: always() run: | @@ -241,7 +241,7 @@ jobs: - name: worker pilot \#2 stdout/stderr if: always() && env.N_WORKERS == '2' run: | - more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-2/pilot-2.out | cat + more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-2/pilot.out | cat - name: worker tasks \#2 stdouts/stderrs if: always() && env.N_WORKERS == '2' run: | @@ -341,7 +341,7 @@ jobs: - name: worker pilot \#1 stdout/stderr if: always() run: | - more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-1/pilot-1.out | cat + more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-1/pilot.out | cat - name: worker tasks \#1 stdouts/stderrs if: always() run: | @@ -350,7 +350,7 @@ jobs: - name: worker pilot \#2 stdout/stderr if: always() && env.N_WORKERS == '2' run: | - more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-2/pilot-2.out | cat + more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-2/pilot.out | cat - name: worker tasks \#2 stdouts/stderrs if: always() && env.N_WORKERS == '2' run: | @@ -442,7 +442,7 @@ jobs: - name: worker pilot \#1 stdout/stderr if: always() run: | - more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-1/pilot-1.out | cat + more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-1/pilot.out | cat - name: worker tasks \#1 stdouts/stderrs if: always() run: | @@ -451,7 +451,7 @@ jobs: - name: worker pilot \#2 stdout/stderr if: always() && env.N_WORKERS == '2' run: | - more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-2/pilot-2.out | cat + more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-2/pilot.out | cat - name: worker tasks \#2 stdouts/stderrs if: always() && env.N_WORKERS == '2' run: | @@ -558,7 +558,7 @@ jobs: - name: worker pilot \#1 stdout/stderr if: always() run: | - more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-1/pilot-1.out | cat + more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-1/pilot.out | cat - name: worker tasks \#1 stdouts/stderrs if: always() run: | @@ -567,7 +567,7 @@ jobs: - name: worker pilot \#2 stdout/stderr if: always() && env.N_WORKERS == '2' run: | - more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-2/pilot-2.out | cat + more $CI_TEST_RUN_STDOUT_STDERR_DIR/worker-2/pilot.out | cat - name: worker tasks \#2 stdouts/stderrs if: always() && env.N_WORKERS == '2' run: | diff --git a/resources/launch_scripts/local-scan.sh b/resources/launch_scripts/local-scan.sh index 8d39e9154..9bba6d6b3 100755 --- a/resources/launch_scripts/local-scan.sh +++ b/resources/launch_scripts/local-scan.sh @@ -71,7 +71,7 @@ for i in $(seq 1 $nworkers); do $launch_scripts_dir/launch_worker.sh \ --client-startup-json $CI_SKYSCAN_STARTUP_JSON \ --debug-directory $SKYSCAN_DEBUG_DIR \ - 2>&1 | tee $dir/pilot-$i.out \ + 2>&1 | tee $dir/pilot.out \ & echo -e "\tworker #$i launched" done