From fe352edaceb501871e5f52ce9fd23f43f3d2fd4e Mon Sep 17 00:00:00 2001 From: ykempf Date: Thu, 13 Jun 2024 12:44:59 +0300 Subject: [PATCH 1/4] Pass scancel --full to cancel jobs --- .github/workflows/github-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index f7fe66f66..09edf7044 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -292,8 +292,8 @@ jobs: #srun -M carrington -t 01:30:00 --job-name CI_testpackage --interactive --nodes=1 -c 4 -n 16 --mem-per-cpu=5G -p short ./small_test_carrington_github_ci.sh VLASIATOR_CIRUNNER_JOBSPEC_TP=$(sbatch --parsable -o testpackage_run_output.txt ./small_test_carrington_github_ci.sh) VLASIATOR_CIRUNNER_JOBSPEC_TP=(${VLASIATOR_CIRUNNER_JOBSPEC_TP//\;/ }) - trap "scancel -M carrington ${VLASIATOR_CIRUNNER_JOBSPEC_TP[0]}" SIGINT - trap "scancel -M carrington ${VLASIATOR_CIRUNNER_JOBSPEC_TP[0]}" SIGTERM + trap "scancel --full -M carrington ${VLASIATOR_CIRUNNER_JOBSPEC_TP[0]}" SIGINT + trap "scancel --full -M carrington ${VLASIATOR_CIRUNNER_JOBSPEC_TP[0]}" SIGTERM RUN_STRING=$( cat << MORO echo "Job finished, checking output." cat testpackage_run_output.txt From 0ad44e022fa636f6ff2e1b6ee9988490e04d8983 Mon Sep 17 00:00:00 2001 From: ykempf Date: Thu, 13 Jun 2024 12:49:35 +0300 Subject: [PATCH 2/4] New line to force interruption of previous ci instance --- .github/workflows/github-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index 09edf7044..abda7738d 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -292,6 +292,7 @@ jobs: #srun -M carrington -t 01:30:00 --job-name CI_testpackage --interactive --nodes=1 -c 4 -n 16 --mem-per-cpu=5G -p short ./small_test_carrington_github_ci.sh VLASIATOR_CIRUNNER_JOBSPEC_TP=$(sbatch --parsable -o testpackage_run_output.txt ./small_test_carrington_github_ci.sh) VLASIATOR_CIRUNNER_JOBSPEC_TP=(${VLASIATOR_CIRUNNER_JOBSPEC_TP//\;/ }) + trap "scancel --full -M carrington ${VLASIATOR_CIRUNNER_JOBSPEC_TP[0]}" SIGINT trap "scancel --full -M carrington ${VLASIATOR_CIRUNNER_JOBSPEC_TP[0]}" SIGTERM RUN_STRING=$( cat << MORO From 834c8c1ce156b6d7c37dd765cf8c55eddb133a5c Mon Sep 17 00:00:00 2001 From: ykempf Date: Thu, 13 Jun 2024 12:53:31 +0300 Subject: [PATCH 3/4] Revert "New line to force interruption of previous ci instance" This reverts commit 0ad44e022fa636f6ff2e1b6ee9988490e04d8983. --- .github/workflows/github-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index abda7738d..09edf7044 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -292,7 +292,6 @@ jobs: #srun -M carrington -t 01:30:00 --job-name CI_testpackage --interactive --nodes=1 -c 4 -n 16 --mem-per-cpu=5G -p short ./small_test_carrington_github_ci.sh VLASIATOR_CIRUNNER_JOBSPEC_TP=$(sbatch --parsable -o testpackage_run_output.txt ./small_test_carrington_github_ci.sh) VLASIATOR_CIRUNNER_JOBSPEC_TP=(${VLASIATOR_CIRUNNER_JOBSPEC_TP//\;/ }) - trap "scancel --full -M carrington ${VLASIATOR_CIRUNNER_JOBSPEC_TP[0]}" SIGINT trap "scancel --full -M carrington ${VLASIATOR_CIRUNNER_JOBSPEC_TP[0]}" SIGTERM RUN_STRING=$( cat << MORO From 445a8189371a21b4ef14fb05f95516e3fb31d88d Mon Sep 17 00:00:00 2001 From: ykempf Date: Thu, 13 Jun 2024 12:59:30 +0300 Subject: [PATCH 4/4] Revert "Revert "New line to force interruption of previous ci instance"" This reverts commit 834c8c1ce156b6d7c37dd765cf8c55eddb133a5c. --- .github/workflows/github-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index 09edf7044..abda7738d 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -292,6 +292,7 @@ jobs: #srun -M carrington -t 01:30:00 --job-name CI_testpackage --interactive --nodes=1 -c 4 -n 16 --mem-per-cpu=5G -p short ./small_test_carrington_github_ci.sh VLASIATOR_CIRUNNER_JOBSPEC_TP=$(sbatch --parsable -o testpackage_run_output.txt ./small_test_carrington_github_ci.sh) VLASIATOR_CIRUNNER_JOBSPEC_TP=(${VLASIATOR_CIRUNNER_JOBSPEC_TP//\;/ }) + trap "scancel --full -M carrington ${VLASIATOR_CIRUNNER_JOBSPEC_TP[0]}" SIGINT trap "scancel --full -M carrington ${VLASIATOR_CIRUNNER_JOBSPEC_TP[0]}" SIGTERM RUN_STRING=$( cat << MORO