Remove pslot dir from local archive folder on CI case completion #2961

TerrenceMcGuinness-NOAA · 2024-09-25T20:49:02Z

Description

This PR adds an cleanup_experiment function in the BASH utils to clean up after a CI case is ran.
This consolidates these actions and also adds the feature to clean the local archive folder specified by $HOMEDIR/archive/$PSLOT.

Resolves #2954

-->

Type of change

Bug fix (fixes something broken)
New feature (adds functionality)
Maintenance (code refactor, clean-up, new CI test, etc.)

Change characteristics

Is this a breaking change (a change in existing functionality)? NO
Does this change require a documentation update? NO
Does this change require an update to any of the following submodules? NO (If YES, please add a link to any PRs that are pending.)
- EMC verif-global
- GDAS
- GFS-utils
- GSI
- GSI-monitor
- GSI-utils
- UFS-utils
- UFS-weather-model
- wxflow

How has this been tested?

Checklist

Any dependent changes have been merged and published
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
I have documented my code, including function, input, and output descriptions
My changes generate no new warnings
New and existing tests pass with my changes
This change is covered by an existing CI test or a new one has been added
I have made corresponding changes to the system documentation if necessary

…rive files

…A/global-workflow into ci_clean_loc_arch

ci/scripts/utils/ci_utils.sh

emcbot · 2024-09-26T09:53:53Z

Experiment C48mx500_3DVarAOWCDA FAILED on Hera in Build# 1 in
/scratch1/NCEPDEV/global/CI/2961/RUNTESTS/EXPDIR/C48mx500_3DVarAOWCDA_b5113675

emcbot · 2024-09-26T11:56:01Z

Experiment C48_S2SW FAILED on Hera in Build# 1 in
/scratch1/NCEPDEV/global/CI/2961/RUNTESTS/EXPDIR/C48_S2SW_b5113675

emcbot · 2024-09-26T12:01:32Z

Experiment C48_ATM FAILED on Hera in Build# 1 in
/scratch1/NCEPDEV/global/CI/2961/RUNTESTS/EXPDIR/C48_ATM_b5113675

emcbot · 2024-09-26T12:01:35Z

Experiment C48_S2SWA_gefs FAILED on Hera in Build# 1 in
/scratch1/NCEPDEV/global/CI/2961/RUNTESTS/EXPDIR/C48_S2SWA_gefs_b5113675

emcbot · 2024-09-26T13:15:15Z

Experiment C96_atm3DVar FAILED on Hera in Build# 1 in
/scratch1/NCEPDEV/global/CI/2961/RUNTESTS/EXPDIR/C96_atm3DVar_b5113675

emcbot · 2024-09-26T13:39:54Z

Experiment C96C48_hybatmDA FAILED on Hera in Build# 1 in
/scratch1/NCEPDEV/global/CI/2961/RUNTESTS/EXPDIR/C96C48_hybatmDA_b5113675

emcbot · 2024-09-26T13:46:32Z

Experiment C96C48_ufs_hybatmDA FAILED on Hera in Build# 1 in
/scratch1/NCEPDEV/global/CI/2961/RUNTESTS/EXPDIR/C96C48_ufs_hybatmDA_b5113675

emcbot · 2024-09-26T14:29:05Z

Experiment C96C48_hybatmaerosnowDA FAILED on Hera in Build# 1 in
/scratch1/NCEPDEV/global/CI/2961/RUNTESTS/EXPDIR/C96C48_hybatmaerosnowDA_b5113675

emcbot · 2024-09-26T14:29:14Z

CI Failed on Hera in Build# 1
Built and ran in directory /scratch1/NCEPDEV/global/CI/2961


Experiment C48mx500_3DVarAOWCDA_b5113675 Completed 2 Cycles: *SUCCESS* at Thu Sep 26 09:53:40 UTC 2024
Experiment C48_S2SW_b5113675 Completed 1 Cycles: *SUCCESS* at Thu Sep 26 11:55:53 UTC 2024
Experiment C48_ATM_b5113675 Completed 1 Cycles: *SUCCESS* at Thu Sep 26 12:01:25 UTC 2024
Experiment C48_S2SWA_gefs_b5113675 Completed 1 Cycles: *SUCCESS* at Thu Sep 26 12:01:26 UTC 2024
Experiment C96_atm3DVar_b5113675 Completed 3 Cycles: *SUCCESS* at Thu Sep 26 13:15:02 UTC 2024
Experiment C96C48_hybatmDA_b5113675 Completed 3 Cycles: *SUCCESS* at Thu Sep 26 13:39:45 UTC 2024
Experiment C96C48_ufs_hybatmDA_b5113675 Completed 2 Cycles: *SUCCESS* at Thu Sep 26 13:46:23 UTC 2024
Experiment C96C48_hybatmaerosnowDA_b5113675 Completed 3 Cycles: *SUCCESS* at Thu Sep 26 14:29:00 UTC 2024

…Jenkins file to cleanup experiment

ci/scripts/utils/ci_utils.sh

emcbot · 2024-09-27T01:04:39Z

CI Passed on Hera in Build# 2
Built and ran in directory /scratch1/NCEPDEV/global/CI/2961


Experiment C48mx500_3DVarAOWCDA_c8a10a9d Completed 2 Cycles: *SUCCESS* at Thu Sep 26 21:00:42 UTC 2024
Experiment C48_ATM_c8a10a9d Completed 1 Cycles: *SUCCESS* at Thu Sep 26 21:00:43 UTC 2024
Experiment C48_S2SW_c8a10a9d Completed 1 Cycles: *SUCCESS* at Thu Sep 26 21:19:12 UTC 2024
Experiment C48_S2SWA_gefs_c8a10a9d Completed 1 Cycles: *SUCCESS* at Thu Sep 26 22:27:02 UTC 2024
Experiment C96C48_ufs_hybatmDA_c8a10a9d Completed 2 Cycles: *SUCCESS* at Thu Sep 26 23:33:05 UTC 2024
Experiment C96_atm3DVar_c8a10a9d Completed 3 Cycles: *SUCCESS* at Thu Sep 26 23:39:07 UTC 2024
Experiment C96C48_hybatmDA_c8a10a9d Completed 3 Cycles: *SUCCESS* at Fri Sep 27 00:27:52 UTC 2024
Experiment C96C48_hybatmaerosnowDA_c8a10a9d Completed 3 Cycles: *SUCCESS* at Fri Sep 27 01:04:31 UTC 2024

WalterKolczynski-NOAA

Will still need to add removal of ATARDIR/LOCALDIR in a future PR.

TerrenceMcGuinness-NOAA · 2024-09-27T13:04:11Z

@WalterKolczynski-NOAA Please put the specifics to those in an Issue Task please.
Making this a draft PR until I can verify the results of the CI Pass.

…ars work in cleanup_experiment

…A/global-workflow into ci_clean_loc_arch

TerrenceMcGuinness-NOAA · 2024-09-27T14:34:52Z

OK, ready for merge.

WalterKolczynski-NOAA · 2024-10-01T19:03:30Z

ci/scripts/utils/ci_utils.sh

+    PSLOT_PATH="$1"
+    pslot=$(basename "${PSLOT_PATH}")
+    HOMEDIR=$(grep 'export HOMEDIR=' "${PSLOT_PATH}/config.base" | cut -d'=' -f2 | tr -d '[:space:]"' || true) || true
+    eval HOMEDIR="${HOMEDIR}"


What is this eval doing? Isn't it already defined on the prior line? eval should be avoided if at all possible.

DavidHuber-NOAA · 2024-10-02T13:31:13Z

ci/scripts/utils/ci_utils.sh

There are a few other directories that contain data, though none are very large:

${ARCHIVEDIR}/metplus_data/by_VSDB/{grid2grid,grid2obs,precip}/*/*/${pslot} ${HOME}/.rocoto/<rocoto version>/${pslot} # These are typically empty directories on success with just a log and .lock file otherwise

EDIT: changed ${HOMEDIR} to ${HOME} for the rocoto directory.

TerryMcGuinness-NOAA and others added 4 commits September 24, 2024 20:28

added a cleanup_experment funciton to ci_utils that cleans local arch…

1c159d8

…rive files

Merge branch 'NOAA-EMC:develop' into ci_clean_loc_arch

e7aa3ba

moved rm for EXPDIR into cleanup_expermiment function

463655a

Merge branch 'ci_clean_loc_arch' of github.com:TerrenceMcGuinness-NOA…

b511367

…A/global-workflow into ci_clean_loc_arch

TerrenceMcGuinness-NOAA added the CI/CD Issue related to CI/CD label Sep 25, 2024

TerrenceMcGuinness-NOAA requested a review from WalterKolczynski-NOAA September 25, 2024 20:49

TerrenceMcGuinness-NOAA self-assigned this Sep 25, 2024

TerrenceMcGuinness-NOAA added the CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera label Sep 25, 2024

github-advanced-security bot found potential problems Sep 25, 2024

View reviewed changes

ci/scripts/utils/ci_utils.sh Fixed Show fixed Hide fixed

ci/scripts/utils/ci_utils.sh Fixed Show fixed Hide fixed

ci/scripts/utils/ci_utils.sh Fixed Show fixed Hide fixed

ci/scripts/utils/ci_utils.sh Fixed Show fixed Hide fixed

emcbot added CI-Hera-Failed **Bot use only** CI testing on Hera for this PR has failed and removed CI-Hera-Failed **Bot use only** CI testing on Hera for this PR has failed labels Sep 26, 2024

fixed bracket sytax error in ci_utils and missnamed function call in …

40c96b2

…Jenkins file to cleanup experiment

github-advanced-security bot found potential problems Sep 26, 2024

View reviewed changes

ci/scripts/utils/ci_utils.sh Fixed Show fixed Hide fixed

ci/scripts/utils/ci_utils.sh Fixed Show fixed Hide fixed

ci/scripts/utils/ci_utils.sh Fixed Show fixed Hide fixed

fixed SC2155 in bash utils for cleanup

54ce216

github-advanced-security bot found potential problems Sep 26, 2024

View reviewed changes

ci/scripts/utils/ci_utils.sh Fixed Show fixed Hide fixed

ci/scripts/utils/ci_utils.sh Fixed Show fixed Hide fixed

TerryMcGuinness-NOAA added 2 commits September 26, 2024 14:54

fixed SC2115 for var expation in path for clean experiment util

cacde8c

needed the OR truch for var assigment via actions in bash

c8a10a9

TerrenceMcGuinness-NOAA added CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera and removed CI-Hera-Failed **Bot use only** CI testing on Hera for this PR has failed labels Sep 26, 2024

emcbot added CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera and removed CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera labels Sep 26, 2024

TerrenceMcGuinness-NOAA changed the title ~~Remove pslot dir from local archive folder on case completion~~ Remove pslot dir from local archive folder on CI case completion Sep 26, 2024

WalterKolczynski-NOAA previously approved these changes Sep 27, 2024

View reviewed changes

TerrenceMcGuinness-NOAA requested a review from DavidHuber-NOAA September 27, 2024 12:54

TerrenceMcGuinness-NOAA marked this pull request as draft September 27, 2024 13:05

fixed the evaluation of HOMDIR so that internal strification of env v…

7c93f4b

…ars work in cleanup_experiment

TerrenceMcGuinness-NOAA dismissed WalterKolczynski-NOAA’s stale review via 7c93f4b September 27, 2024 14:25

TerrenceMcGuinness-NOAA and others added 4 commits September 27, 2024 10:25

Merge branch 'develop' into ci_clean_loc_arch

bb92a39

still needed archive tagged back onto HOMEDIR

bfcbba5

Merge branch 'ci_clean_loc_arch' of github.com:TerrenceMcGuinness-NOA…

69fc51b

…A/global-workflow into ci_clean_loc_arch

new linee at aend of ci_utils

49b4489

TerrenceMcGuinness-NOAA marked this pull request as ready for review September 27, 2024 14:34

TerrenceMcGuinness-NOAA requested a review from WalterKolczynski-NOAA September 27, 2024 14:34

WalterKolczynski-NOAA requested changes Oct 1, 2024

View reviewed changes

DavidHuber-NOAA reviewed Oct 2, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove pslot dir from local archive folder on CI case completion #2961

Remove pslot dir from local archive folder on CI case completion #2961

TerrenceMcGuinness-NOAA commented Sep 25, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 27, 2024

WalterKolczynski-NOAA left a comment

TerrenceMcGuinness-NOAA commented Sep 27, 2024 •

edited

Loading

TerrenceMcGuinness-NOAA commented Sep 27, 2024

WalterKolczynski-NOAA Oct 1, 2024

DavidHuber-NOAA Oct 2, 2024 •

edited

Loading

Remove pslot dir from local archive folder on CI case completion #2961

Are you sure you want to change the base?

Remove pslot dir from local archive folder on CI case completion #2961

Conversation

TerrenceMcGuinness-NOAA commented Sep 25, 2024

Description

Type of change

Change characteristics

How has this been tested?

Checklist

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 26, 2024

emcbot commented Sep 27, 2024

WalterKolczynski-NOAA left a comment

Choose a reason for hiding this comment

TerrenceMcGuinness-NOAA commented Sep 27, 2024 • edited Loading

TerrenceMcGuinness-NOAA commented Sep 27, 2024

WalterKolczynski-NOAA Oct 1, 2024

Choose a reason for hiding this comment

DavidHuber-NOAA Oct 2, 2024 • edited Loading

Choose a reason for hiding this comment

TerrenceMcGuinness-NOAA commented Sep 27, 2024 •

edited

Loading

DavidHuber-NOAA Oct 2, 2024 •

edited

Loading