From b54b003414d4ddc41c9f6dfd14ef32d61fe54f78 Mon Sep 17 00:00:00 2001 From: Chan-Hoo Jeon Date: Tue, 2 Jul 2024 12:57:51 -0500 Subject: [PATCH 1/4] increase wtime for nightly jenkins test --- sorc/test/check_ctest.sh | 2 +- sorc/test/hera_ctest.sh | 5 +++-- sorc/test/orion_ctest.sh | 5 +++-- sorc/test/run_hera_ctest.sh | 4 ++-- sorc/test/run_orion_ctest.sh | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sorc/test/check_ctest.sh b/sorc/test/check_ctest.sh index 2ecac03b..187e8f03 100755 --- a/sorc/test/check_ctest.sh +++ b/sorc/test/check_ctest.sh @@ -1,6 +1,6 @@ #!/bin/bash #SBATCH -o out.check -#SBATCH --account=nems +#SBATCH --account=epic set -eux echo "ctest check is done" diff --git a/sorc/test/hera_ctest.sh b/sorc/test/hera_ctest.sh index cb2b8fbe..ddbcdfe8 100755 --- a/sorc/test/hera_ctest.sh +++ b/sorc/test/hera_ctest.sh @@ -1,10 +1,11 @@ #!/bin/bash #SBATCH -o out.ctest -#SBATCH --account=nems +#SBATCH --account=epic set -eux source ../../versions/build.ver_hera -module use ../../modulefiles && module load build_hera_intel +module use ../../modulefiles +module load build_hera_intel ctest diff --git a/sorc/test/orion_ctest.sh b/sorc/test/orion_ctest.sh index 44863672..cb718f2b 100755 --- a/sorc/test/orion_ctest.sh +++ b/sorc/test/orion_ctest.sh @@ -1,10 +1,11 @@ #!/bin/bash #SBATCH -o out.ctest -#SBATCH --account=nems +#SBATCH --account=epic set -eux source ../../versions/build.ver_orion -module use ../../modulefiles && module load build_orion_intel +module use ../../modulefiles +module load build_orion_intel ctest diff --git a/sorc/test/run_hera_ctest.sh b/sorc/test/run_hera_ctest.sh index ad8f0307..53ebe5d6 100755 --- a/sorc/test/run_hera_ctest.sh +++ b/sorc/test/run_hera_ctest.sh @@ -1,9 +1,9 @@ #!/bin/bash set -eux -JOB_ID=$(sbatch --job-name=ctest --account=nems --qos=debug --ntasks-per-node=6 --nodes=1 --time=00:30:00 ./hera_ctest.sh | awk '{print $4}') +JOB_ID=$(sbatch --job-name=ctest --account=epic --qos=batch --ntasks-per-node=7 --nodes=1 --time=02:00:00 ./hera_ctest.sh | awk '{print $4}') -CHECK_ID=$(sbatch --job-name=ctest --account=nems --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh) +CHECK_ID=$(sbatch --job-name=ctest --account=epic --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh) sleep 3m diff --git a/sorc/test/run_orion_ctest.sh b/sorc/test/run_orion_ctest.sh index dfc12290..a98736d6 100755 --- a/sorc/test/run_orion_ctest.sh +++ b/sorc/test/run_orion_ctest.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eux -JOB_ID=$(sbatch --job-name=ctest --account=epic --qos=debug --ntasks-per-node=6 --nodes=1 --time=00:30:00 ./orion_ctest.sh | awk '{print $4}') +JOB_ID=$(sbatch --job-name=ctest --account=epic --qos=batch --ntasks-per-node=7 --nodes=1 --time=02:00:00 ./orion_ctest.sh | awk '{print $4}') CHECK_ID=$(sbatch --job-name=ctest --account=epic --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh) From bbbcf603174215c6d5d22d1de1fc89e1224ab269 Mon Sep 17 00:00:00 2001 From: Chan-Hoo Jeon Date: Tue, 2 Jul 2024 13:44:46 -0500 Subject: [PATCH 2/4] change time limit --- sorc/test/run_hera_ctest.sh | 4 ++-- sorc/test/run_orion_ctest.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sorc/test/run_hera_ctest.sh b/sorc/test/run_hera_ctest.sh index 53ebe5d6..c1d55db6 100755 --- a/sorc/test/run_hera_ctest.sh +++ b/sorc/test/run_hera_ctest.sh @@ -1,11 +1,11 @@ #!/bin/bash set -eux -JOB_ID=$(sbatch --job-name=ctest --account=epic --qos=batch --ntasks-per-node=7 --nodes=1 --time=02:00:00 ./hera_ctest.sh | awk '{print $4}') +JOB_ID=$(sbatch --job-name=ctest --account=epic --qos=batch --ntasks-per-node=7 --nodes=1 --time=01:00:00 ./hera_ctest.sh | awk '{print $4}') CHECK_ID=$(sbatch --job-name=ctest --account=epic --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh) -sleep 3m +sleep 10m if [ -f out.ctest ]; then cat out.ctest diff --git a/sorc/test/run_orion_ctest.sh b/sorc/test/run_orion_ctest.sh index a98736d6..c62b4836 100755 --- a/sorc/test/run_orion_ctest.sh +++ b/sorc/test/run_orion_ctest.sh @@ -5,7 +5,7 @@ JOB_ID=$(sbatch --job-name=ctest --account=epic --qos=batch --ntasks-per-node=7 CHECK_ID=$(sbatch --job-name=ctest --account=epic --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh) -sleep 3m +sleep 30m if [ -f out.ctest ]; then cat out.ctest From 8cd44362321bc00b9d48686a3512d9c2e5254d51 Mon Sep 17 00:00:00 2001 From: "Chan-hoo.Jeon" Date: Wed, 3 Jul 2024 14:10:01 +0000 Subject: [PATCH 3/4] change account back to nems --- sorc/test/run_hera_ctest.sh | 6 +++--- sorc/test/run_orion_ctest.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sorc/test/run_hera_ctest.sh b/sorc/test/run_hera_ctest.sh index c1d55db6..647668dd 100755 --- a/sorc/test/run_hera_ctest.sh +++ b/sorc/test/run_hera_ctest.sh @@ -1,11 +1,11 @@ #!/bin/bash set -eux -JOB_ID=$(sbatch --job-name=ctest --account=epic --qos=batch --ntasks-per-node=7 --nodes=1 --time=01:00:00 ./hera_ctest.sh | awk '{print $4}') +JOB_ID=$(sbatch --job-name=ctest --account=nems --qos=debug --ntasks-per-node=7 --nodes=1 --time=00:30:00 ./hera_ctest.sh | awk '{print $4}') -CHECK_ID=$(sbatch --job-name=ctest --account=epic --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh) +CHECK_ID=$(sbatch --job-name=ctest --account=nems --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh) -sleep 10m +sleep 5m if [ -f out.ctest ]; then cat out.ctest diff --git a/sorc/test/run_orion_ctest.sh b/sorc/test/run_orion_ctest.sh index c62b4836..4ba17d41 100755 --- a/sorc/test/run_orion_ctest.sh +++ b/sorc/test/run_orion_ctest.sh @@ -1,9 +1,9 @@ #!/bin/bash set -eux -JOB_ID=$(sbatch --job-name=ctest --account=epic --qos=batch --ntasks-per-node=7 --nodes=1 --time=02:00:00 ./orion_ctest.sh | awk '{print $4}') +JOB_ID=$(sbatch --job-name=ctest --account=nems --qos=batch --ntasks-per-node=7 --nodes=1 --time=02:00:00 ./orion_ctest.sh | awk '{print $4}') -CHECK_ID=$(sbatch --job-name=ctest --account=epic --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh) +CHECK_ID=$(sbatch --job-name=ctest --account=nems --qos=debug --ntasks-per-node=1 --nodes=1 --time=00:01:00 --dependency=afterok:$JOB_ID ./check_ctest.sh) sleep 30m From d292eb24747119db4d8d20b07d3c901b2f463421 Mon Sep 17 00:00:00 2001 From: "Chan-hoo.Jeon" Date: Wed, 3 Jul 2024 14:12:11 +0000 Subject: [PATCH 4/4] add missing change --- sorc/test/check_ctest.sh | 2 +- sorc/test/hera_ctest.sh | 2 +- sorc/test/orion_ctest.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sorc/test/check_ctest.sh b/sorc/test/check_ctest.sh index 187e8f03..2ecac03b 100755 --- a/sorc/test/check_ctest.sh +++ b/sorc/test/check_ctest.sh @@ -1,6 +1,6 @@ #!/bin/bash #SBATCH -o out.check -#SBATCH --account=epic +#SBATCH --account=nems set -eux echo "ctest check is done" diff --git a/sorc/test/hera_ctest.sh b/sorc/test/hera_ctest.sh index ddbcdfe8..06cad79a 100755 --- a/sorc/test/hera_ctest.sh +++ b/sorc/test/hera_ctest.sh @@ -1,6 +1,6 @@ #!/bin/bash #SBATCH -o out.ctest -#SBATCH --account=epic +#SBATCH --account=nems set -eux source ../../versions/build.ver_hera diff --git a/sorc/test/orion_ctest.sh b/sorc/test/orion_ctest.sh index cb718f2b..94885d9b 100755 --- a/sorc/test/orion_ctest.sh +++ b/sorc/test/orion_ctest.sh @@ -1,6 +1,6 @@ #!/bin/bash #SBATCH -o out.ctest -#SBATCH --account=epic +#SBATCH --account=nems set -eux source ../../versions/build.ver_orion