Skip to content

Commit

Permalink
Merge pull request 2i2c-org#5299 from sgibson91/ci-fixup
Browse files Browse the repository at this point in the history 
Ci fixup
  • Loading branch information
@sgibson91
sgibson91 authored Dec 19, 2024
2 parents a43e8df + e57db4d commit fea045d
Showing 1 changed file with 74 additions and 70 deletions.
144 changes: 74 additions & 70 deletions .github/workflows/deploy-hubs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- "!deployer/commands/generate/resource_allocation/**"
- requirements.txt
- .github/actions/setup-deploy/**
- .github/workflows/deploy-hubs.yaml
- helm-charts/**
- config/clusters/**
# Exclude the template configuration files
Expand All @@ -37,6 +38,7 @@ on:
- "!deployer/commands/generate/resource_allocation/**"
- requirements.txt
- .github/actions/setup-deploy/**
- .github/workflows/deploy-hubs.yaml
- helm-charts/**
- config/clusters/**
# Exclude the template configuration files
Expand Down Expand Up @@ -206,36 +208,36 @@ jobs:
#
# If you are adding a new cluster, please remember to list it here!
outputs:
failure_2i2c-aws-us: "${{ steps.declare-failure.outputs.failure_2i2c-aws-us }}"
failure_2i2c-uk: "${{ steps.declare-failure.outputs.failure_2i2c-uk }}"
failure_2i2c: "${{ steps.declare-failure.outputs.failure_2i2c }}"
failure_awi-ciroh: "${{ steps.declare-failure.outputs.failure_awi-ciroh }}"
failure_catalystproject-africa: "${{ steps.declare-failure.outputs.failure_catalystproject-africa }}"
failure_catalystproject-latam: "${{ steps.declare-failure.outputs.failure_catalystproject-latam }}"
failure_cloudbank: "${{ steps.declare-failure.outputs.failure_cloudbank }}"
failure_dubois: "${{ steps.declare-failure.outputs.failure_dubois }}"
failure_earthscope: "${{ steps.declare-failure.outputs.failure_earthscope }}"
failure_gridsst: "${{ steps.declare-failure.outputs.failure_gridsst }}"
failure_hhmi: "${{ steps.declare-failure.outputs.failure_hhmi }}"
failure_jupyter-health: "${{ steps.declare-failure.outputs.failure_jupyter-health }}"
failure_jupyter-meets-the-earth: "${{ steps.declare-failure.outputs.failure_jupyter-meets-the-earth }}"
failure_kitware: "${{ steps.declare-failure.outputs.failure_kitware }}"
failure_leap: "${{ steps.declare-failure.outputs.failure_leap }}"
failure_maap: "${{ steps.declare-failure.outputs.failure_maap }}"
failure_nasa-cryo: "${{ steps.declare-failure.outputs.failure_nasa-cryo }}"
failure_nasa-ghg: "${{ steps.declare-failure.outputs.failure_nasa-ghg }}"
failure_nasa-veda: "${{ steps.declare-failure.outputs.failure_nasa-veda }}"
failure_nmfs-openscapes: "${{ steps.declare-failure.outputs.failure_nmfs-openscapes }}"
failure_openscapes: "${{ steps.declare-failure.outputs.failure_openscapes }}"
failure_opensci: "${{ steps.declare-failure.outputs.failure_opensci }}"
failure_pangeo-hubs: "${{ steps.declare-failure.outputs.failure_pangeo-hubs }}"
failure_projectpythia: "${{ steps.declare-failure.outputs.failure_projectpythia }}"
failure_queensu: "${{ steps.declare-failure.outputs.failure_queensu }}"
failure_smithsonian: "${{ steps.declare-failure.outputs.failure_smithsonian }}"
failure_strudel: "${{ steps.declare-failure.outputs.failure_strudel }}"
failure_ubc-eoas: "${{ steps.declare-failure.outputs.failure_ubc-eoas }}"
failure_utoronto: "${{ steps.declare-failure.outputs.failure_utoronto }}"
failure_victor: "${{ steps.declare-failure.outputs.failure_victor }}"
failure_2i2c-aws-us: ${{ steps.declare-failure.outputs.failure_2i2c-aws-us }}
failure_2i2c-uk: ${{ steps.declare-failure.outputs.failure_2i2c-uk }}
failure_2i2c: ${{ steps.declare-failure.outputs.failure_2i2c }}
failure_awi-ciroh: ${{ steps.declare-failure.outputs.failure_awi-ciroh }}
failure_catalystproject-africa: ${{ steps.declare-failure.outputs.failure_catalystproject-africa }}
failure_catalystproject-latam: ${{ steps.declare-failure.outputs.failure_catalystproject-latam }}
failure_cloudbank: ${{ steps.declare-failure.outputs.failure_cloudbank }}
failure_dubois: ${{ steps.declare-failure.outputs.failure_dubois }}
failure_earthscope: ${{ steps.declare-failure.outputs.failure_earthscope }}
failure_gridsst: ${{ steps.declare-failure.outputs.failure_gridsst }}
failure_hhmi: ${{ steps.declare-failure.outputs.failure_hhmi }}
failure_jupyter-health: ${{ steps.declare-failure.outputs.failure_jupyter-health }}
failure_jupyter-meets-the-earth: ${{ steps.declare-failure.outputs.failure_jupyter-meets-the-earth }}
failure_kitware: ${{ steps.declare-failure.outputs.failure_kitware }}
failure_leap: ${{ steps.declare-failure.outputs.failure_leap }}
failure_maap: ${{ steps.declare-failure.outputs.failure_maap }}
failure_nasa-cryo: ${{ steps.declare-failure.outputs.failure_nasa-cryo }}
failure_nasa-ghg: ${{ steps.declare-failure.outputs.failure_nasa-ghg }}
failure_nasa-veda: ${{ steps.declare-failure.outputs.failure_nasa-veda }}
failure_nmfs-openscapes: ${{ steps.declare-failure.outputs.failure_nmfs-openscapes }}
failure_openscapes: ${{ steps.declare-failure.outputs.failure_openscapes }}
failure_opensci: ${{ steps.declare-failure.outputs.failure_opensci }}
failure_pangeo-hubs: ${{ steps.declare-failure.outputs.failure_pangeo-hubs }}
failure_projectpythia: ${{ steps.declare-failure.outputs.failure_projectpythia }}
failure_queensu: ${{ steps.declare-failure.outputs.failure_queensu }}
failure_smithsonian: ${{ steps.declare-failure.outputs.failure_smithsonian }}
failure_strudel: ${{ steps.declare-failure.outputs.failure_strudel }}
failure_ubc-eoas: ${{ steps.declare-failure.outputs.failure_ubc-eoas }}
failure_utoronto: ${{ steps.declare-failure.outputs.failure_utoronto }}
failure_victor: ${{ steps.declare-failure.outputs.failure_victor }}

if: |
(github.event_name == 'push' && contains(github.ref, 'main')) &&
Expand Down Expand Up @@ -326,16 +328,18 @@ jobs:
filtered_staging_jobs = [
staging_job
for staging_job in staging_jobs
if outputs[f"failure_{staging_job['cluster_name'].replace('.', '-')}"] != "true"
if f"failure_{staging_job['cluster_name'].replace('.', '-')}" in staging_jobs.keys()
and outputs[f"failure_{staging_job['cluster_name'].replace('.', '-')}"] != "true"
]
filtered_prod_jobs = [
prod_job
for prod_job in prod_jobs
if outputs[f"failure_{prod_job['cluster_name'].replace('.', '-')}"] != "true"
if f"failure_{staging_job['cluster_name'].replace('.', '-')}" in staging_jobs.keys()
and outputs[f"failure_{prod_job['cluster_name'].replace('.', '-')}"] != "true"
]
except KeyError:
print(f"The {cluster_name} cluster wasn't found in the `upgrade-support.outputs` list. Please add it before continuing!")
except KeyError as ke:
print(f"A cluster wasn't found in the `upgrade-support.outputs` list. Please add it before continuing! {repr(ke)}")
output_file = os.getenv("GITHUB_OUTPUT")
with open(output_file, "a") as f:
Expand Down Expand Up @@ -439,40 +443,40 @@ jobs:
#
# If you are adding a new cluster/staging hub, please remember to list it here!
outputs:
failure_2i2c_staging: "${{ steps.declare-failure.outputs.failure_2i2c_staging }}"
failure_2i2c_dask-staging: "${{ steps.declare-failure.outputs.failure_2i2c_dask-staging }}"
failure_2i2c_ucmercedstaging: "${{ steps.declare-failure.outputs.failure_2i2c_ucmercedstaging }}"
failure_2i2c-aws-us_staging: "${{ steps.declare-failure.outputs.failure_2i2c-aws-us_staging }}"
failure_2i2c-aws-us_dask-staging: "${{ steps.declare-failure.outputs.failure_2i2c-aws-us_dask-staging }}"
failure_2i2c-uk_staging: "${{ steps.declare-failure.outputs.failure_2i2c-uk_staging }}"
failure_awi-ciroh_staging: "${{ steps.declare-failure.outputs.failure_awi-ciroh_staging }}"
failure_catalystproject-africa_staging: "${{ steps.declare-failure.outputs.failure_catalystproject-africa_staging }}"
failure_catalystproject-latam_staging: "${{ steps.declare-failure.outputs.failure_catalystproject-latam_staging }}"
failure_cloudbank_staging: "${{ steps.declare-failure.outputs.failure_cloudbank_staging }}"
failure_dubois_staging: "${{ steps.declare-failure.outputs.failure_dubois_staging }}"
failure_earthscope_staging: "${{ steps.declare-failure.outputs.failure_earthscope_staging }}"
failure_gridsst_staging: "${{ steps.declare-failure.outputs.failure_gridsst_staging }}"
failure_hhmi_staging: "${{ steps.declare-failure.outputs.failure_hhmi_staging }}"
failure_jupyter-health_staging: "${{ steps.declare-failure.outputs.failure_jupyter-health_staging }}"
failure_jupyter-meets-the-earth_staging: "${{ steps.declare-failure.outputs.failure_jupyter-meets-the-earth_staging }}"
failure_kitware_staging: "${{ steps.declare-failure.outputs.failure_kitware_staging }}"
failure_leap_staging: "${{ steps.declare-failure.outputs.failure_leap_staging }}"
failure_maap_staging: "${{ steps.declare-failure.outputs.failure_maap_staging }}"
failure_nasa-cryo_staging: "${{ steps.declare-failure.outputs.failure_nasa-cryo_staging }}"
failure_nasa-ghg_staging: "${{ steps.declare-failure.outputs.failure_nasa-ghg_staging }}"
failure_nasa-veda_staging: "${{ steps.declare-failure.outputs.failure_nasa-veda_staging }}"
failure_nmfs-openscapes_staging: "${{ steps.declare-failure.outputs.failure_nmfs-openscapes_staging }}"
failure_openscapes_staging: "${{ steps.declare-failure.outputs.failure_openscapes_staging }}"
failure_opensci_staging: "${{ steps.declare-failure.outputs.failure_opensci_staging }}"
failure_pangeo-hubs_staging: "${{ steps.declare-failure.outputs.failure_pangeo-hubs_staging }}"
failure_projectpythia_staging: "${{ steps.declare-failure.outputs.failure_projectpythia_staging }}"
failure_queensu_staging: "${{ steps.declare-failure.outputs.failure_queensu_staging }}"
failure_smithsonian_staging: "${{ steps.declare-failure.outputs.failure_smithsonian_staging }}"
failure_strudel_staging: "${{ steps.declare-failure.outputs.failure_strudel_staging }}"
failure_ubc-eoas_staging: "${{ steps.declare-failure.outputs.failure_ubc-eoas_staging }}"
failure_utoronto_staging: "${{ steps.declare-failure.outputs.failure_utoronto_staging }}"
failure_utoronto_r-staging: "${{ steps.declare-failure.outputs.failure_utoronto_r-staging }}"
failure_victor_staging: "${{ steps.declare-failure.outputs.failure_victor_staging }}"
failure_2i2c_staging: ${{ steps.declare-failure.outputs.failure_2i2c_staging }}
failure_2i2c_dask-staging: ${{ steps.declare-failure.outputs.failure_2i2c_dask-staging }}
failure_2i2c_ucmercedstaging: ${{ steps.declare-failure.outputs.failure_2i2c_ucmercedstaging }}
failure_2i2c-aws-us_staging: ${{ steps.declare-failure.outputs.failure_2i2c-aws-us_staging }}
failure_2i2c-aws-us_dask-staging: ${{ steps.declare-failure.outputs.failure_2i2c-aws-us_dask-staging }}
failure_2i2c-uk_staging: ${{ steps.declare-failure.outputs.failure_2i2c-uk_staging }}
failure_awi-ciroh_staging: ${{ steps.declare-failure.outputs.failure_awi-ciroh_staging }}
failure_catalystproject-africa_staging: ${{ steps.declare-failure.outputs.failure_catalystproject-africa_staging }}
failure_catalystproject-latam_staging: ${{ steps.declare-failure.outputs.failure_catalystproject-latam_staging }}
failure_cloudbank_staging: ${{ steps.declare-failure.outputs.failure_cloudbank_staging }}
failure_dubois_staging: ${{ steps.declare-failure.outputs.failure_dubois_staging }}
failure_earthscope_staging: ${{ steps.declare-failure.outputs.failure_earthscope_staging }}
failure_gridsst_staging: ${{ steps.declare-failure.outputs.failure_gridsst_staging }}
failure_hhmi_staging: ${{ steps.declare-failure.outputs.failure_hhmi_staging }}
failure_jupyter-health_staging: ${{ steps.declare-failure.outputs.failure_jupyter-health_staging }}
failure_jupyter-meets-the-earth_staging: ${{ steps.declare-failure.outputs.failure_jupyter-meets-the-earth_staging }}
failure_kitware_staging: ${{ steps.declare-failure.outputs.failure_kitware_staging }}
failure_leap_staging: ${{ steps.declare-failure.outputs.failure_leap_staging }}
failure_maap_staging: ${{ steps.declare-failure.outputs.failure_maap_staging }}
failure_nasa-cryo_staging: ${{ steps.declare-failure.outputs.failure_nasa-cryo_staging }}
failure_nasa-ghg_staging: ${{ steps.declare-failure.outputs.failure_nasa-ghg_staging }}
failure_nasa-veda_staging: ${{ steps.declare-failure.outputs.failure_nasa-veda_staging }}
failure_nmfs-openscapes_staging: ${{ steps.declare-failure.outputs.failure_nmfs-openscapes_staging }}
failure_openscapes_staging: ${{ steps.declare-failure.outputs.failure_openscapes_staging }}
failure_opensci_staging: ${{ steps.declare-failure.outputs.failure_opensci_staging }}
failure_pangeo-hubs_staging: ${{ steps.declare-failure.outputs.failure_pangeo-hubs_staging }}
failure_projectpythia_staging: ${{ steps.declare-failure.outputs.failure_projectpythia_staging }}
failure_queensu_staging: ${{ steps.declare-failure.outputs.failure_queensu_staging }}
failure_smithsonian_staging: ${{ steps.declare-failure.outputs.failure_smithsonian_staging }}
failure_strudel_staging: ${{ steps.declare-failure.outputs.failure_strudel_staging }}
failure_ubc-eoas_staging: ${{ steps.declare-failure.outputs.failure_ubc-eoas_staging }}
failure_utoronto_staging: ${{ steps.declare-failure.outputs.failure_utoronto_staging }}
failure_utoronto_r-staging: ${{ steps.declare-failure.outputs.failure_utoronto_r-staging }}
failure_victor_staging: ${{ steps.declare-failure.outputs.failure_victor_staging }}

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -568,8 +572,8 @@ jobs:
if len(failed_jobs) == 0:
filtered_prod_jobs.append(prod_job)
except KeyError:
print(f"The {cluster_name} cluster wasn't found in the `upgrade-staging.outputs` list. Please add it before continuing!")
except KeyError as ke:
print(f"A cluster and staging hub wasn't found in the `upgrade-staging.outputs` list. Please add it before continuing! {repr(ke)}")
output_file = os.getenv("GITHUB_OUTPUT")
with open(output_file, "a") as f:
Expand Down

0 comments on commit fea045d

Please sign in to comment.