[develop] Fix Jenkins Nightly Build (#1161)

The Jenkins nightly builds have been inconsistent or not working at all on the parallel works (PW) platforms. Some of the issues have been related to the instance's infrastructure on Azure or a conda conflict between the host machine and the conda built by the SRW App (originally seeing on GCP is now being observed for all PW platforms). This PR resolves the conda conflict by deactivating the host conda before activating the srw_app environment for all PW platforms. The solution for Azure requires configurations changes, which were done on the backend. --------- Co-authored-by: Parallel Works app-run user <Edward.Snyder@mgmt-edwardsnyder-awsrocky8test-00006.pw-noaa-us-east-1.pw.local> Co-authored-by: michael.lueken <[email protected]>
ufs-community · Dec 2, 2024 · 4fbdf7f · 4fbdf7f
1 parent dfb8fd3
commit 4fbdf7f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 12 deletions.
diff --git a/.cicd/scripts/srw_ftest.sh b/.cicd/scripts/srw_ftest.sh
@@ -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

diff --git a/.cicd/scripts/srw_metric.sh b/.cicd/scripts/srw_metric.sh
@@ -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

diff --git a/doc/conf.py b/doc/conf.py
@@ -103,6 +103,7 @@
 linkcheck_ignore = [r'https://www\.intel\.com/content/www/us/en/docs/cpp\-compiler/developer\-guide\-reference/2021\-10/thread\-affinity\-interface\.html',
                     r'https://www\.intel\.com/content/www/us/en/developer/tools/oneapi/hpc\-toolkit\-download\.html',
                     r'https://glossary.ametsoc.org/.*',
+                    r'https://readthedocs.org/projects/ufs-srweather-app/',
                    ]
 
 # Ignore anchor tags for SRW App data bucket. Shows Not Found even when they exist.

diff --git a/modulefiles/tasks/noaacloud/python_srw.lua b/modulefiles/tasks/noaacloud/python_srw.lua
@@ -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
diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua
@@ -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