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.

Sign up for GitHub

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

Jump to bottom

[develop] Fix Jenkins Nightly Build #1161

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

[develop] Fix Jenkins Nightly Build #1161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bdcf767
add logic to handle conda host conflict
EdwardSnyder-NOAA Nov 25, 2024
96400fe
updated spack-stack env
EdwardSnyder-NOAA Nov 25, 2024
2b7f792
removed legacy azure logic
Nov 26, 2024
1572bca
Merge branch 'ufs-community:develop' into fix-pw-vx-issue
EdwardSnyder-NOAA Nov 26, 2024
10ba527
extend run post walltime
EdwardSnyder-NOAA Nov 26, 2024
9c9c63f
remove wall time increase
EdwardSnyder-NOAA Nov 27, 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
2 changes: 1 addition & 1 deletion .cicd/scripts/srw_ftest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ module use modulefiles
module load build_${platform,,}_${SRW_COMPILER}
module load wflow_${platform,,}
# Deactivate conflicting conda env on GCP
[[ "${SRW_PLATFORM}" =~ "gclusternoaa" ]] && conda deactivate
[[ "${platform}" == "noaacloud" ]] && conda deactivate

[[ ${FORGIVE_CONDA} == true ]] && set +e +u # Some platforms have incomplete python3 or conda support, but wouldn't necessarily block workflow tests
conda activate srw_app
Expand Down
2 changes: 1 addition & 1 deletion .cicd/scripts/srw_metric.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ cd ${workspace}
# Activate workflow environment
module load wflow_${platform,,}
# Deactivate conflicting conda env on GCP
[[ "${SRW_PLATFORM}" =~ "gclusternoaa" ]] && conda deactivate
[[ "${platform}" == "noaacloud" ]] && conda deactivate

[[ ${FORGIVE_CONDA} == true ]] && set +e +u # Some platforms have incomplete python3 or conda support, but would not necessarily block workflow tests
conda activate srw_app
Expand Down
5 changes: 0 additions & 5 deletions modulefiles/tasks/noaacloud/python_srw.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
load("conda")
setenv("SRW_ENV", "srw_app")

-- Add missing libstdc binary for Azure
if os.getenv("PW_CSP") == "azure" then
setenv("LD_PRELOAD","/opt/nvidia/nsight-systems/2023.1.2/host-linux-x64/libstdc++.so.6")
end
5 changes: 0 additions & 5 deletions modulefiles/tasks/noaacloud/run_vx.local.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,3 @@ end
load("ufs-pyenv")
load("conda")
setenv("SRW_ENV", "srw_app")

-- Add missing libstdc binary for Azure
if os.getenv("PW_CSP") == "azure" then
setenv("LD_PRELOAD","/opt/nvidia/nsight-systems/2023.1.2/host-linux-x64/libstdc++.so.6")
end
Loading