Skip to content

Fixed regression testing and throttled builds on S4. #894 #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DavidHuber-NOAA wants to merge 3 commits into from
Closed

Fixed regression testing and throttled builds on S4. #894 #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47d473c
Fixed regression testing and throttled builds on S4. #894
DavidHuber-NOAA Nov 3, 2021
bdf7ff5
Merge remote-tracking branch 'upstream/develop' into fix_s4_rt
DavidHuber-NOAA Nov 3, 2021
76f32c5
Merge remote-tracking branch 'upstream/develop' into fix_s4_rt
DavidHuber-NOAA Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down