Skip to content
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.

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

Add hash to CI experiment paths to avoid collisions #1735

Merged

Conversation

TerrenceMcGuinness-NOAA
Copy link
Collaborator

@TerrenceMcGuinness-NOAA TerrenceMcGuinness-NOAA commented Jul 12, 2023

Description

When creating experiments we add a HASH tag onto the pslot name so that we can get unique behavior when moving archive information around.

Also, the "extra" pslot name is removed down from the ../RUNTESTS/ path

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

  • Clone, Build, and Ran case C48_S2S on Orion

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes need updates to the documentation. I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • New and existing tests pass with my changes

TerrenceMcGuinness-NOAA and others added 30 commits June 7, 2023 09:40
no op change for test
no op change for test
…nness-NOAA/global-workflow into feature_1732_add-pslot-tag
…nness-NOAA/global-workflow into feature_1732_add-pslot-tag
…nness-NOAA/global-workflow into feature_1732_add-pslot-tag
ci/scripts/check_ci.sh Fixed Show fixed Hide fixed
# since all successfull ones where previously removed
if [[ "${num_cases}" -eq 0 ]] && [[ -d "${pr_dir}/RUNTESTS" ]]; then
if [[ -z $(ls -A "${pr_dir}/RUNTESTS/EXPDIR") ]] ; then

Check notice

Code scanning / shellcheck

Consider invoking this command separately to avoid masking its return value (or use '|| true' to ignore).

Consider invoking this command separately to avoid masking its return value (or use '|| true' to ignore).
TerryMcGuinness-NOAA and others added 4 commits July 12, 2023 10:21
…nness-NOAA/global-workflow into feature_1732_add-pslot-tag
can not use || ture because needs to be false when dir is empty
Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have tried to clear up the confusion between a case and pslot.
A case is not a pslot as the pslot now contains a git SHA.

ci/scripts/driver.sh Outdated Show resolved Hide resolved
ci/scripts/driver.sh Outdated Show resolved Hide resolved
ci/scripts/run_ci.sh Outdated Show resolved Hide resolved
ci/scripts/run_ci.sh Outdated Show resolved Hide resolved
ci/scripts/run_ci.sh Outdated Show resolved Hide resolved
ci/scripts/clone-build_ci.sh Outdated Show resolved Hide resolved
ci/scripts/check_ci.sh Outdated Show resolved Hide resolved
ci/scripts/check_ci.sh Outdated Show resolved Hide resolved
ci/scripts/check_ci.sh Outdated Show resolved Hide resolved
@WalterKolczynski-NOAA WalterKolczynski-NOAA changed the title Feature 1732 add pslot tag Add hash to CI experiment paths to avoid collisions Jul 12, 2023
Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Though I have a few more suggestions for clean up that uses the variables defined rather than creating paths from variables that need to be known.

ci/scripts/check_ci.sh Outdated Show resolved Hide resolved
ci/scripts/check_ci.sh Outdated Show resolved Hide resolved
ci/scripts/clone-build_ci.sh Outdated Show resolved Hide resolved
ci/scripts/run_ci.sh Outdated Show resolved Hide resolved
ci/scripts/run_ci.sh Outdated Show resolved Hide resolved
ci/scripts/check_ci.sh Outdated Show resolved Hide resolved
@TerrenceMcGuinness-NOAA
Copy link
Collaborator Author

Machine: Orion
Start: Wed Jul 12 16:54:17 CDT 2023 on Orion-login-1.HPC.MsState.Edu
---------------------------------------------------
Checkout:                      *SUCCESS*
Checkout: Completed at Wed Jul 12 16:56:34 CDT 2023
Build:                         *SUCCESS*
Build: Completed at Wed Jul 12 17:26:03 CDT 2023
Created experiment:            *SUCCESS*
Case setup: Completed at Wed Jul 12 17:26:11 CDT 2023 for experiment C48_S2S_61d242ea
Created experiment:            *SUCCESS*
Case setup: Completed at Wed Jul 12 17:26:15 CDT 2023 for experiment C96_atm3DVar_61d242ea
Created experiment:            *SUCCESS*
Case setup: Completed at Wed Jul 12 17:26:20 CDT 2023 for experiment C96C48_hybatmDA_61d242ea
Experiment C48_S2S_61d242ea completed: *SUCCESS*
Experiment C48_S2S_61d242ea Completed at Wed Jul 12 18:06:08 CDT 2023
with 18 successfully completed jobs
Experiment C96_atm3DVar_61d242ea completed: *SUCCESS*
Experiment C96_atm3DVar_61d242ea Completed at Wed Jul 12 19:36:09 CDT 2023
with 86 successfully completed jobs
Experiment C96C48_hybatmDA_61d242ea completed: *SUCCESS*
Experiment C96C48_hybatmDA_61d242ea Completed at Wed Jul 12 20:18:12 CDT 2023
with 148 successfully completed jobs

@TerrenceMcGuinness-NOAA
Copy link
Collaborator Author

With final updates debugged all cases pass.

Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great.

@aerorahul aerorahul merged commit 631fe61 into NOAA-EMC:develop Jul 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants