From 47d473c8ee11e1db7973372974f484107c7b6d66 Mon Sep 17 00:00:00 2001 From: David Huber Date: Wed, 3 Nov 2021 13:40:12 +0000 Subject: [PATCH] Fixed regression testing and throttled builds on S4. #894 --- tests/detect_machine.sh | 2 +- tests/rt.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh index cbb4f85456..461fb2faa7 100755 --- a/tests/detect_machine.sh +++ b/tests/detect_machine.sh @@ -114,7 +114,7 @@ MACHINE_ID=${RT_MACHINE:-${MACHINE_ID}} # Append compiler if [ $MACHINE_ID = orion ] || [ $MACHINE_ID = hera ] || [ $MACHINE_ID = cheyenne ] || [ $MACHINE_ID = jet ] || \ - [ $MACHINE_ID = gaea ] || [ $MACHINE_ID = stampede ] || [ $MACHINE_ID = s4] || [ $MACHINE_ID = expanse ] ; then + [ $MACHINE_ID = gaea ] || [ $MACHINE_ID = stampede ] || [ $MACHINE_ID = s4 ] || [ $MACHINE_ID = expanse ] ; then MACHINE_ID=${MACHINE_ID}.${RT_COMPILER} fi diff --git a/tests/rt.sh b/tests/rt.sh index 081fbfa1e2..ce8e3a9095 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -570,9 +570,11 @@ if [[ $ECFLOW == true ]]; then MAX_BUILDS=10 MAX_JOBS=30 - # Reduce maximum number of compile jobs on jet.intel because of licensing issues + # Reduce maximum number of compile jobs on jet.intel and s4.intel because of licensing issues if [[ $MACHINE_ID = jet.intel ]]; then MAX_BUILDS=5 + elif [[ $MACHINE_ID = s4.intel ]]; then + MAX_BUILDS=1 fi if [[ $MACHINE_ID = hera.* ]] && [[ ! $HOSTNAME = hecflow* ]]; then