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

Build aws updates prototype #305

Closed
wants to merge 102 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
0436e69
added GitHub pipeline for runner on pw
Sep 25, 2024
7829f7d
added repos name to chekcout
Sep 25, 2024
fc4bf1f
added ssh to hera from pw before actions/checkout@v3
Sep 25, 2024
a4126a3
had to create dir on hera first
Sep 25, 2024
82f4b99
ssh then two commands
Sep 25, 2024
581c31e
cd to target dir firsts the mk
Sep 25, 2024
9d79705
added -t and EOF for getting ssh to run in one shot
Sep 25, 2024
3d15521
skipping checkout@v3 and pushing forwrad
Sep 25, 2024
25bc12b
ready to test CI pw pipeline using self hosted runner on pw
Sep 26, 2024
cb7fa7a
removed default branch in dispatch
Sep 26, 2024
d56f313
removed branch input as it not needed
Sep 26, 2024
658e745
set BRANCH_NAME and PR_NUMBER in advance
Sep 26, 2024
08bc4b8
set BRANCH_NAME and PR_NUMBER in advance
Sep 26, 2024
9f910f7
only add TEST_DIR in env and use githug when needed
Sep 26, 2024
8d2fcfd
had extra steps section now removed
Sep 26, 2024
3c207b4
forgot to put in expression for branch in checkout
Sep 26, 2024
0c8b9fa
needed env for TEST_DIR on subsquent sections
Sep 26, 2024
00ff9f9
misspelled TEST_DIR in a few places
Sep 26, 2024
57b8cd6
Had tags wrong for running on Runner in subsquent jobs
Sep 26, 2024
f78d573
added shared env between jobs using ouputs for TEST_DIR
Sep 26, 2024
08ab7ec
missing header and on: dispatch
Sep 26, 2024
00f2d9b
fix new location of create_experment and added local env def into nex…
Sep 27, 2024
09688e8
Merge branch 'test_pw_ghrunner' of github.com:TerrenceMcGuinness-NOAA…
Sep 27, 2024
c0734a9
moved env section in create-experiments
Sep 27, 2024
146aa62
corrected path to getting TEST_DIR address in create-experiments
Sep 27, 2024
09f8075
moved env for HOMEgfs into steps on create
Sep 27, 2024
daddf59
updaed env for run experiments too
Sep 27, 2024
d8b9b13
update env section to define HOMEgfs in run
Sep 27, 2024
6fa30fb
need pr in path for cases
Sep 27, 2024
c4c99df
hard coded id so not to have to rebuild
Sep 27, 2024
71a8d87
added overwrite to create experment
Sep 27, 2024
70e249a
removed skips
Sep 27, 2024
19c2c86
removed direct git clone and used cross mounted path to RHHPCS direct…
Sep 30, 2024
751054d
made distinction between runners path and RDPHCS path with CHECKOUT_D…
Sep 30, 2024
9b163e9
fixed reference to CHECKOUT_DIR and updated submodule arguments to ch…
Sep 30, 2024
bd8da4e
updated GITHUB ENV and OUTPUT syntax
Sep 30, 2024
fd878f9
added lfs and shallow depth for submodules to get checkout to work
Sep 30, 2024
15dbf30
turn off git-lfs becasue it is not in the pw env
Sep 30, 2024
4a85a18
gdas checkout submodule failed again because it did not complete, rem…
Sep 30, 2024
ec4e850
added extra git configure to try to help with the checkout issues wit…
Sep 30, 2024
7c11c96
upgrade checkout@v3 to checckout@v4.2.0
Sep 30, 2024
bf42c6a
removed redundent specification of TEST_DIR when writing to GITHUB_OU…
Sep 30, 2024
0e91eba
also added verif-global.fd as a shallow clone
Sep 30, 2024
9c00b4e
rsync check out dir after it is cloned on pw onto RDPHCS cross mounte…
Oct 1, 2024
a5db8bd
worked on correct path for rsync to RDHPCS
Oct 1, 2024
6454f41
remore optons to chmod on dest in rysnc
Oct 1, 2024
e9f6e61
Merge branch 'NOAA-EMC:develop' into test_pw_ghrunner
TerrenceMcGuinness-NOAA Oct 1, 2024
9cfab8e
update fms version to match spack stack on pw
Oct 2, 2024
249bd9f
updated run.sh to use MACHINE_ID in load fv4gfs modules script
Oct 2, 2024
6267f58
updated version of g2tmpl and change to module file noaacloud.intl fo…
Oct 3, 2024
12fc5c0
add patch for updating ufs_noaacloud.intel module file from global-wo…
Oct 3, 2024
109b67c
add versioning for noaacloud and temp patch to ufs_module module file…
Oct 3, 2024
557a13f
removed githug action pipeline for pw to make this a build pr
Oct 3, 2024
ca69f8a
moved source of ver for runtime in load fv3gfs modules back to before…
Oct 3, 2024
2366a9b
changed the runtime version of g2tmp down
Oct 3, 2024
068ada6
update bucket to contrib in awspw hosts yaml file for ICs
Oct 4, 2024
e6da9e8
updated location of ICs (no bucker dir in /contrib)
Oct 4, 2024
5b07703
update start hour to 00 for C48_ATM
Oct 4, 2024
ba76126
Merge branch 'NOAA-EMC:develop' into build_aws_updates
TerrenceMcGuinness-NOAA Oct 7, 2024
40a8592
added first pass at GitHub Action Pipelines for CI on pw
Oct 8, 2024
3616743
updated pw to paralleworks in lables to runners
Oct 8, 2024
267e39d
trying checkout@v3 because Centos GLIB not supported
Oct 8, 2024
1767803
beefed up checkout action to v4 and added a bunch of helpers so run r…
Oct 9, 2024
2cd9d22
needed to indent steps on first stage
Oct 9, 2024
a4de837
made sure suboudles where fully recursive
Oct 9, 2024
2c87707
updated submodule command for v4
Oct 9, 2024
16cde87
add noaacloud config file for create experment bash script
Oct 9, 2024
d6f383a
added mkdir for RUNTESTS and added confg file under ci/platforms for …
Oct 9, 2024
1d5d291
path to create experment was wrong
Oct 9, 2024
75514d2
path to pr cases was also stale and wrong
Oct 9, 2024
577e8df
removed bug feature HOMEgfs and updated runtime ver numbers for fv3gf…
Oct 9, 2024
7a4dedf
needed third arg to run-check_ci.sh for getting the TESTDIR path with…
Oct 9, 2024
6c763cb
removed cron bash ci values from platforms config for noaacload
Oct 10, 2024
508ffc6
Update config.noaacloud
TerrenceMcGuinness-NOAA Oct 10, 2024
e1448a4
Update globalworkflow-ci-pw-ssh.yaml
TerrenceMcGuinness-NOAA Oct 10, 2024
99e3cab
added the switch overwirte to create experment in GitHub Pipeline CI …
Oct 10, 2024
8c5369e
Merge branch 'NOAA-EMC:develop' into build_aws_updates
TerrenceMcGuinness-NOAA Oct 10, 2024
cf284fc
using checkout v3 for centos 7
Oct 10, 2024
cf41b80
revered to checkout v4 for centos 7 because found fix and reverted to…
Oct 10, 2024
3eea38d
putting g2tmpl_ver back to 1.13.0
Oct 10, 2024
25944e7
dropped a quote on the end of BACI_IC string
Oct 10, 2024
a059fd1
Merge branch 'build_aws_updates' of github.com:TerrenceMcGuinness-NOA…
Oct 10, 2024
bfa65ce
two runners, one for rocky the other for centos
Oct 10, 2024
7b20639
renamed actons for ssh, rocky, and centos
Oct 10, 2024
6a29eb6
move source of run time module versions up a few lines to its origina…
Oct 11, 2024
17d061e
remove runtime ver conflics in run noaacloud env settings
Oct 15, 2024
0f38f0d
improved provision runner script from bash sheel check
Oct 15, 2024
1e297a3
couple of more shell check updates to provision runner
Oct 15, 2024
b01d0b0
couple of more shell check updates to provision runner
Oct 15, 2024
bb5658d
added last line to provision runner script
Oct 15, 2024
9af68fb
Merge branch 'NOAA-EMC:develop' into build_aws_updates
TerrenceMcGuinness-NOAA Oct 15, 2024
1715e7d
chmod x on provision runner scripts and add UserBootstrap code for Ce…
Oct 15, 2024
881f917
reduced this branch to only build run changes seperate to ci
Oct 16, 2024
a5f4614
added correct pipline for ci
Oct 16, 2024
ba8f0ff
added rocky workflow for testing development
Oct 18, 2024
05ffb6d
added a kludge fix to mound epic contrib disk for access on the compu…
Oct 21, 2024
7926989
added runtime ver for noaa cload rocky 8
Oct 21, 2024
fd3ab64
added test if all ready mounted
Oct 21, 2024
ca92d54
added to distinct runtime ver vor noaa cload for centos and rocky
Oct 21, 2024
0fb55a2
updated runtime versions for centos
Oct 21, 2024
24d6388
remove github pipeline codes
Oct 21, 2024
fe0e581
Merge branch 'NOAA-EMC:develop' into build_aws_updates_prototype
TerrenceMcGuinness-NOAA Oct 22, 2024
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
3 changes: 3 additions & 0 deletions ci/platforms/config.noaacloud
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/bash

export HPC_ACCOUNT=${USER}
3 changes: 3 additions & 0 deletions sorc/build_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ fi
#------------------------------------
# TODO: Commented out until components aligned for build
#source ../versions/build.ver
if [[ "${MACHINE_ID}" == "noaacloud" ]] ; then
source "../versions/build.${MACHINE_ID}.ver"
fi

#------------------------------------
# Exception Handling Init
Expand Down
8 changes: 8 additions & 0 deletions sorc/build_ufs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ COMPILE_NR=0
CLEAN_BEFORE=YES
CLEAN_AFTER=NO

#TODO temp patch for build update for noaacload in advance of updating ufs_module.fd repo for global-workflow building
if [[ "${MACHINE_ID}" == "noaacloud" ]] ; then
patched=$(grep upp-addon-env modulefiles/ufs_noaacloud.intel.lua; echo $?)
if [[ ${patched} == "1" ]] ; then
patch -R modulefiles/ufs_noaacloud.intel.lua ../ufs_noaacloud.intel.diff
fi
fi

BUILD_JOBS=${BUILD_JOBS:-8} ./tests/compile.sh "${MACHINE_ID}" "${MAKE_OPT}" "${COMPILE_NR}" "intel" "${CLEAN_BEFORE}" "${CLEAN_AFTER}"
mv "./tests/fv3_${COMPILE_NR}.exe" ./tests/ufs_model.x
mv "./tests/modules.fv3_${COMPILE_NR}.lua" ./tests/modules.ufs_model.lua
Expand Down
10 changes: 10 additions & 0 deletions sorc/ufs_noaacloud.intel.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- ufs_noaacloud.intel.lua 2024-10-03 15:54:33.334583588 +0000
+++ ufs_model.fd/modulefiles/ufs_noaacloud.intel.lua 2024-10-03 16:11:28.534275972 +0000
@@ -3,7 +3,6 @@
]])

prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
load(pathJoin("stack-intel", stack_intel_ver))
22 changes: 18 additions & 4 deletions ush/load_fv3gfs_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,28 @@ ulimit_s=$( ulimit -S -s )
source "${HOMEgfs}/ush/detect_machine.sh"
source "${HOMEgfs}/ush/module-setup.sh"

# Source versions file for runtime
source "${HOMEgfs}/versions/run.ver"

# Load our modules:
module use "${HOMEgfs}/modulefiles"

case "${MACHINE_ID}" in
"wcoss2" | "hera" | "orion" | "hercules" | "gaea" | "jet" | "s4" | "noaacloud")
"noaacloud")
#TODO this is a total kludge to get epic mount point for compute nodes
# to be the same as the login node. This should be workng from in the
# ALLNODES section of the User Bootstrap of Parllel Works but it doen't
# on the Rokcky Clusters (works fine in the Centos 7 cluster)
if [[ ! -d /contrib-epic/EPIC ]]; then
/contrib/Terry.McGuinness/SETUP/mount-epic-contrib.sh
sudo systemctl daemon-reload
fi
# Check if the OS is Rocky or CentOS
OS_NAME=$(grep -E '^ID=' /etc/os-release | sed -E 's/ID="?([^"]*)"?/\1/') || true
# Source versions file for runtime
source "${HOMEgfs}/versions/run.${MACHINE_ID}.${OS_NAME}.ver"
module load "module_base.${MACHINE_ID}"
;;
"wcoss2" | "hera" | "orion" | "hercules" | "gaea" | "jet" | "s4")
# Source versions file for runtime
source "${HOMEgfs}/versions/run.${MACHINE_ID}.ver"
module load "module_base.${MACHINE_ID}"
;;
*)
Expand Down
12 changes: 12 additions & 0 deletions versions/run.noaacloud.centos.ver
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export stack_intel_ver=2021.3.0
export stack_impi_ver=2021.3.0
export spack_env=gsi-addon-env

source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"

export g2tmpl_ver=1.10.2
export jasper_ver=2.0.32
export wgrib2_ver=2.0.8
export cdo_ver=1.9.5
export nco_ver=4.9.3
12 changes: 12 additions & 0 deletions versions/run.noaacloud.rocky.ver
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export stack_intel_ver=2021.3.0
export stack_impi_ver=2021.3.0
export spack_env=gsi-addon-env

source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"

export g2tmpl_ver=1.10.2
export wgrib2_ver=3.1.2_wmo
export cdo_ver=2.3.0
export jasper_ver=4.2.0
export nco_ver=5.1.6
6 changes: 5 additions & 1 deletion versions/run.noaacloud.ver
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@ export spack_env=gsi-addon-env
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"

export cdo_ver=2.2.0
export g2tmpl_ver=1.10.2
export wgrib2_ver=3.1.2_wmo
export cdo_ver=2.3.0
export jasper_ver=4.2.0
export nco_ver=5.1.6
4 changes: 2 additions & 2 deletions versions/spack.ver
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export jasper_ver=2.0.32
export libpng_ver=1.6.37
export zlib_ver=1.2.13
export esmf_ver=8.5.0
export fms_ver=2023.02.01
export fms_ver=2023.04
export cdo_ver=2.2.0
export nco_ver=5.0.6

Expand All @@ -23,7 +23,7 @@ export g2_ver=3.4.5
export sp_ver=2.5.0
export ip_ver=4.3.0
export gsi_ncdiag_ver=1.1.2
export g2tmpl_ver=1.10.2
export g2tmpl_ver=1.13.0
export crtm_ver=2.4.0.1
export wgrib2_ver=2.0.8
export grib_util_ver=1.3.0
Expand Down
Loading