Skip to content

Commit 77b414a

Browse files
authored
Merge branch 'bartgol/change-ghci-snl-cpu-output-root' (PR #7628)
Make eamxx-v1 workflow simpler and increase security of CI runs. [BFB]
2 parents 7e23461 + 63e745a commit 77b414a

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

.github/workflows/eamxx-v1-testing.yml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ env:
4747
submit: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch') }}
4848
# Generate only if user requested via workflow_dispatch
4949
generate: ${{ github.event_name == 'workflow_dispatch' && inputs.bless }}
50-
# Correct case folder suffix for generate/compare, used to find files to upload as artifacts
51-
folder_suffix: ${{ github.event_name == 'workflow_dispatch' && inputs.bless && '.G' || '.C' }}
5250
# Compare/generate flags for create_test
5351
flags: ${{ github.event_name == 'workflow_dispatch' && inputs.bless && '-o -g -b master' || '-c -b master' }}
5452

@@ -74,7 +72,7 @@ jobs:
7472
short_name: ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-small_kernels--eamxx-output-preset-5
7573
- full_name: REP_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.ghci-snl-cpu_gnu
7674
short_name: REP_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx
77-
- full_name: "ERS.ne4pg2_ne4pg2.F2010-SCREAMv1.ghci-snl-cpu_gnu.eamxx-prod"
75+
- full_name: ERS.ne4pg2_ne4pg2.F2010-SCREAMv1.ghci-snl-cpu_gnu.eamxx-prod
7876
short_name: ERS.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-prod
7977
fail-fast: false
8078
name: cpu-gcc / ${{ matrix.test.short_name }}
@@ -113,14 +111,11 @@ jobs:
113111
with:
114112
name: logs.${{ matrix.test.short_name }}
115113
path: |
116-
/projects/e3sm/scratch/${{ matrix.test.full_name }}${{ env.folder_suffix }}*/TestStatus
117-
/projects/e3sm/scratch/${{ matrix.test.full_name }}${{ env.folder_suffix }}*/TestStatus.log
118-
/projects/e3sm/scratch/${{ matrix.test.full_name }}${{ env.folder_suffix }}*/bld/*.bldlog.*
119-
/projects/e3sm/scratch/${{ matrix.test.full_name }}${{ env.folder_suffix }}*/bld/case2bld/*.bldlog.*
120-
/projects/e3sm/scratch/${{ matrix.test.full_name }}${{ env.folder_suffix }}*/run/*.log.*
121-
/projects/e3sm/scratch/${{ matrix.test.full_name }}${{ env.folder_suffix }}*/run/case2run/*.log.*
122-
/projects/e3sm/scratch/${{ matrix.test.full_name }}${{ env.folder_suffix }}*/run/*.cprnc.out
123-
/projects/e3sm/scratch/${{ matrix.test.full_name }}${{ env.folder_suffix }}*/run/case2run/*.cprnc.out
114+
/tmp/${{ matrix.test.full_name }}*/TestStatus
115+
/tmp/${{ matrix.test.full_name }}*/TestStatus.log
116+
/tmp/${{ matrix.test.full_name }}*/bld/**/*.bldlog.*
117+
/tmp/${{ matrix.test.full_name }}*/run/**/*.log.*
118+
/tmp/${{ matrix.test.full_name }}*/run/**/*.cprnc.out
124119
retention-days: 14
125120
env:
126121
NODE_EXTRA_CA_CERTS: ${{ env.NODE_EXTRA_CA_CERTS }}
@@ -130,12 +125,7 @@ jobs:
130125
with:
131126
name: outputs.${{ matrix.test.short_name }}
132127
path: |
133-
/projects/e3sm/scratch/${{ matrix.test.full_name }}${{ env.folder_suffix }}*/run/*.nc*
134-
/projects/e3sm/scratch/${{ matrix.test.full_name }}${{ env.folder_suffix }}*/run/case2run/*.nc*
128+
/tmp/${{ matrix.test.full_name }}*/run/**/*.nc*
135129
retention-days: 14
136130
env:
137131
NODE_EXTRA_CA_CERTS: ${{ env.NODE_EXTRA_CA_CERTS }}
138-
- name: Clean up
139-
if: ${{ always() }}
140-
run: |
141-
rm -rf /projects/e3sm/scratch/${{ matrix.test.full_name }}*

cime_config/machines/config_machines.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1771,7 +1771,7 @@
17711771
<PROXY>proxy.sandia.gov:80</PROXY>
17721772
<COMPILERS>gnu</COMPILERS>
17731773
<MPILIBS>openmpi</MPILIBS>
1774-
<CIME_OUTPUT_ROOT>/projects/e3sm/scratch</CIME_OUTPUT_ROOT>
1774+
<CIME_OUTPUT_ROOT>/tmp</CIME_OUTPUT_ROOT>
17751775
<DIN_LOC_ROOT>/projects/e3sm/inputdata</DIN_LOC_ROOT>
17761776
<DIN_LOC_ROOT_CLMFORC>/projects/e3sm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
17771777
<DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>

0 commit comments

Comments
 (0)