Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
6 changes: 3 additions & 3 deletions dev/ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ def HOMEgfs_dev = 'none'
def CI_CASES = ''
def GH = 'none'
// Map of the machine names (MACHINE_ID) to the Jenkins Node names
def NodeName = [hera: 'Hera-EMC', ursa: 'Ursa-EMC', orion: 'Orion-EMC', hercules: 'Hercules-EMC', gaeac5: 'GaeaC5', gaeac6: 'Gaeac6-EMC']
def NodeName = [hera: 'Hera-EMC', ursa: 'Ursa-EMC', orion: 'Orion-EMC', hercules: 'Hercules-EMC', gaeac6: 'Gaeac6-EMC']
// Location of the custom workspaces for each machine in the CI system. They are persistent for each iteration of the PR.
def custom_workspace = [hera: '/scratch3/NCEPDEV/global/role.glopara/CI/HERA', ursa: '/scratch3/NCEPDEV/global/role.glopara/CI/URSA', orion: '/work2/noaa/global/role-global/GFS_CI_CD/ORION/CI', hercules: '/work2/noaa/global/role-global/GFS_CI_CD/HERCULES/CI', gaeac5: '/gpfs/f5/epic/proj-shared/global/CI', gaeac6: '/gpfs/f6/drsa-precip3/world-shared/global/CI']
def custom_workspace = [hera: '/scratch3/NCEPDEV/global/role.glopara/CI/HERA', ursa: '/scratch3/NCEPDEV/global/role.glopara/CI/URSA', orion: '/work2/noaa/global/role-global/GFS_CI_CD/ORION/CI', hercules: '/work2/noaa/global/role-global/GFS_CI_CD/HERCULES/CI', gaeac6: '/gpfs/f6/drsa-precip3/world-shared/global/CI']
def repo_url = '[email protected]:NOAA-EMC/global-workflow.git'

def STATUS = 'Passed'
Expand Down Expand Up @@ -87,7 +87,7 @@ pipeline {
Machine = machine[0].toUpperCase() + machine.substring(1)
echo "Getting Common Workspace for ${Machine}"
ws("${custom_workspace[machine]}/${env.CHANGE_ID}") {
properties([parameters([[$class: 'NodeParameterDefinition', allowedSlaves: ['built-in', 'hercules-emc', 'hera-emc', 'ursa-emc', 'orion-emc', 'gaeaC5', 'gaeaC6-emc'], defaultSlaves: ['built-in'], name: '', nodeEligibility: [$class: 'AllNodeEligibility'], triggerIfResult: 'allCases']])])
properties([parameters([[$class: 'NodeParameterDefinition', allowedSlaves: ['built-in', 'hercules-emc', 'hera-emc', 'ursa-emc', 'orion-emc', 'gaeaC6-emc'], defaultSlaves: ['built-in'], name: '', nodeEligibility: [$class: 'AllNodeEligibility'], triggerIfResult: 'allCases']])])
GH = sh(script: "which gh || echo '~/bin/gh'", returnStdout: true).trim()
CUSTOM_WORKSPACE = "${WORKSPACE}"
HOMEgfs = "${CUSTOM_WORKSPACE}/global-workflow"
Expand Down
2 changes: 1 addition & 1 deletion dev/ci/Jenkinsfile4AWS
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pipeline {
Machine = machine[0].toUpperCase() + machine.substring(1)
echo "Getting Common Workspace for ${Machine}"
ws("${custom_workspace[machine]}/${env.CHANGE_ID}") {
properties([parameters([[$class: 'NodeParameterDefinition', allowedSlaves: ['built-in', 'Hercules-EMC', 'Hera-EMC', 'Orion-EMC', 'GaeaC5', 'GaeaC6-EMC', 'Awsepicglobalworkflow'], defaultSlaves: ['built-in'], name: '', nodeEligibility: [$class: 'AllNodeEligibility'], triggerIfResult: 'allCases']])])
properties([parameters([[$class: 'NodeParameterDefinition', allowedSlaves: ['built-in', 'Hercules-EMC', 'Hera-EMC', 'Orion-EMC', 'GaeaC6-EMC', 'Awsepicglobalworkflow'], defaultSlaves: ['built-in'], name: '', nodeEligibility: [$class: 'AllNodeEligibility'], triggerIfResult: 'allCases']])])
GH = sh(script: "which gh || echo '~/bin/gh'", returnStdout: true).trim()
CUSTOM_WORKSPACE = "${custom_workspace[machine]}/${env.CHANGE_ID}/${aws_gw_name}"
HOMEgfs = "${CUSTOM_WORKSPACE}/${aws_gw_name}"
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C48_ATM_ecflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ skip_ci_on_hosts:
- wcoss2
- hera
- ursa
- gaeac5
- gaeac6
- orion
- hercules
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C48_S2SWA_gefs_RT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ experiment:
# Add this to run the stage ic job 'icsdir: /lfs/h2/emc/ens/noscrub/eric.sinsky/RETRO_ICS'
skip_ci_on_hosts:
- gaeac6
- gaeac5
- hercules
- wcoss2
- hera
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C48_S2SW_extended.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ experiment:
skip_ci_on_hosts:
- hera
- ursa
- gaeac5
- gaeac6
- orion
- hercules
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ experiment:
yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/soca_gfs_defaults_ci.yaml

skip_ci_on_hosts:
- gaeac5
- orion
- awsepicglobalworkflow

Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C48mx500_hybAOWCDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ experiment:
yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/soca_hyb_gfs_defaults_ci.yaml

skip_ci_on_hosts:
- gaeac5
- orion
- awsepicglobalworkflow

Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96C48_hybatmDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ experiment:

skip_ci_on_hosts:
- awsepicglobalworkflow
- gaeac5

workflow:
engine: rocoto
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96C48_hybatmsnowDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ experiment:

skip_ci_on_hosts:
- orion
- gaeac5
- hercules
- awsepicglobalworkflow

Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96C48_hybatmsoilDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ experiment:
skip_ci_on_hosts:
- orion
- hercules
- gaeac5
- awsepicglobalworkflow

workflow:
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ experiment:
yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml

skip_ci_on_hosts:
- gaeac5
- gaeac6
- orion
- hercules
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96C48_ufsgsi_hybatmDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ experiment:
yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/ufsgsi_hybatmDA_defaults.ci.yaml

skip_ci_on_hosts:
- gaeac5
- gaeac6
- orion
- hercules
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ experiment:
yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/gfs_cyc_defaults_ci.yaml

skip_ci_on_hosts:
- gaeac5

workflow:
engine: rocoto
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96_atm3DVar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ experiment:
yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/gfs_metp_ci.yaml

skip_ci_on_hosts:
- gaeac5
- awsepicglobalworkflow
- wcoss2

Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96_atm3DVar_extended.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ experiment:
skip_ci_on_hosts:
- hera
- ursa
- gaeac5
- gaeac6
- orion
- hercules
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96_gcafs_cycled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ experiment:
yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/gcafs_cycled_defaults_ci.yaml

skip_ci_on_hosts:
- gaeac5
- awsepicglobalworkflow

workflow:
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96_gcafs_cycled_noDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ experiment:

skip_ci_on_hosts:
- orion
- gaeac5
- hercules
- awsepicglobalworkflow

Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/pr/C96mx100_S2S.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ experiment:
yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/sfs_defaults.yaml

skip_ci_on_hosts:
- gaeac5
- awsepicglobalworkflow

workflow:
Expand Down
1 change: 0 additions & 1 deletion dev/ci/cases/sfsv1/C96mx025_S2S.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ experiment:
yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/sfs_CPC_defaults.yaml

skip_ci_on_hosts:
- gaeac5
- awsepicglobalworkflow

workflow:
Expand Down
7 changes: 0 additions & 7 deletions dev/ci/platforms/config.gaeac5

This file was deleted.

2 changes: 1 addition & 1 deletion dev/ci/scripts/utils/gitlab/launch_gitlab_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ host="$(hostname)"
source "${HOMEgfs_}/ush/detect_machine.sh"
# Check the MACHINE_ID and set up the environment accordingly
case "${MACHINE_ID}" in
hera | orion | hercules | wcoss2 | gaeac5 | gaeac6)
hera | orion | hercules | wcoss2 | gaeac6)
echo "Running GitLab Runner script on ${MACHINE_ID}"
;;
noaacloud)
Expand Down
2 changes: 1 addition & 1 deletion dev/ci/scripts/utils/launch_java_agent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ host=$(hostname)

source "${HOMEgfs_}/ush/detect_machine.sh"
case ${MACHINE_ID} in
hera | orion | hercules | wcoss2 | gaeac5 | gaeac6)
hera | orion | hercules | wcoss2 | gaeac6)
echo "Launch Jenkins Java Controler on ${MACHINE_ID}"
;;
noaacloud)
Expand Down
4 changes: 0 additions & 4 deletions dev/parm/config/gcafs/config.resources
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ case ${machine} in
max_tasks_per_node=192
mem_node_max="360GB"
;;
"GAEAC5")
max_tasks_per_node=128
mem_node_max="251GB"
;;
"GAEAC6")
max_tasks_per_node=192
mem_node_max="384GB"
Expand Down
1 change: 0 additions & 1 deletion dev/parm/config/gcafs/config.resources.GAEAC5

This file was deleted.

1 change: 0 additions & 1 deletion dev/parm/config/gefs/config.resources
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ case ${machine} in
"URSA") max_tasks_per_node=192;;
"ORION") max_tasks_per_node=40;;
"HERCULES") max_tasks_per_node=80;;
"GAEAC5") max_tasks_per_node=128;;
"GAEAC6") max_tasks_per_node=192;;
"AWSPW")
export PARTITION_BATCH="compute"
Expand Down
1 change: 0 additions & 1 deletion dev/parm/config/gefs/config.resources.GAEAC5

This file was deleted.

4 changes: 0 additions & 4 deletions dev/parm/config/gfs/config.resources
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ case ${machine} in
max_tasks_per_node=192
mem_node_max="360GB"
;;
"GAEAC5")
max_tasks_per_node=128
mem_node_max="251GB"
;;
"GAEAC6")
max_tasks_per_node=192
mem_node_max="384GB"
Expand Down
9 changes: 0 additions & 9 deletions dev/parm/config/gfs/config.resources.GAEAC5

This file was deleted.

2 changes: 1 addition & 1 deletion dev/ush/load_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ case "${MODULE_TYPE}" in
module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"

case "${MACHINE_ID}" in
"hera" | "orion" | "hercules" | "wcoss2" | "gaeac5" | "gaeac6" | "ursa" | "noaacloud")
"hera" | "orion" | "hercules" | "wcoss2" | "gaeac6" | "ursa" | "noaacloud")
#TODO: Remove LMOD_TMOD_FIND_FIRST line when spack-stack on WCOSS2
if [[ "${MACHINE_ID}" == "wcoss2" ]]; then
export LMOD_TMOD_FIND_FIRST=yes
Expand Down
4 changes: 1 addition & 3 deletions dev/workflow/hosts.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Host:
"""

SUPPORTED_HOSTS = ['HERA', 'URSA', 'ORION', 'HERCULES', 'WCOSS2', 'CONTAINER',
'GAEAC5', 'GAEAC6', 'AWSPW', 'AZUREPW', 'GOOGLEPW']
'GAEAC6', 'AWSPW', 'AZUREPW', 'GOOGLEPW']

def __init__(self, host=None):

Expand Down Expand Up @@ -84,8 +84,6 @@ def detect(self) -> None:
self.machine = socket.gethostname().split("-", 1)[0].upper()
elif os.path.exists('/lfs/f1'):
self.machine = 'WCOSS2'
elif os.path.exists('/gpfs/f5'):
self.machine = 'GAEAC5'
elif os.path.exists('/gpfs/f6'):
self.machine = 'GAEAC6'
elif container is not None:
Expand Down
34 changes: 0 additions & 34 deletions dev/workflow/hosts/gaeac5.yaml

This file was deleted.

Loading
Loading