#2692 Upgrade integration test Spack version

stfc · Aug 27, 2024 · 9184963 · 9184963
1 parent 1647dc7
commit 9184963
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/lfric_test.yml b/.github/workflows/lfric_test.yml
@@ -79,8 +79,8 @@ jobs:
     - name: LFRic passthrough (with DistributedMemory)
       run: |
         # Set up environment
-        source /apps/spack/spack-upstream/share/spack/setup-env.sh
-        spack load lfric-buildenv%gcc
+        source /apps/spack/psyclone-spack/spack-repo/share/spack/setup-env.sh
+        spack load lfric-build-envirnoment%gcc@14
         source .runner_venv/bin/activate
         export PSYCLONE_LFRIC_DIR=${GITHUB_WORKSPACE}/examples/lfric/scripts
         export PSYCLONE_CONFIG_FILE=${PSYCLONE_LFRIC_DIR}/KGOs/lfric_psyclone.cfg
@@ -119,8 +119,8 @@ jobs:
     - name: LFRic with all transformations
       run: |
         # Set up environment
-        source /apps/spack/spack-upstream/share/spack/setup-env.sh
-        spack load lfric-buildenv%gcc
+        source /apps/spack/psyclone-spack/spack-repo/share/spack/setup-env.sh
+        spack load lfric-build-envirnoment%gcc@14
         source .runner_venv/bin/activate
         export PSYCLONE_LFRIC_DIR=${GITHUB_WORKSPACE}/examples/lfric/scripts
         export PSYCLONE_CONFIG_FILE=${PSYCLONE_LFRIC_DIR}/KGOs/lfric_psyclone.cfg

diff --git a/.github/workflows/nemo_v5_tests.yml b/.github/workflows/nemo_v5_tests.yml
@@ -74,7 +74,7 @@ jobs:
     - name: NEMO 5.0 gcc passthrough
       run: |
         # Set up environment
-        source /apps/spack/spack-upstream/share/spack/setup-env.sh
+        source /apps/spack/psyclone-spack/spack-repo/share/spack/setup-env.sh
         spack unload && spack load nemo-build-environment%gcc@14
         source .runner_venv/bin/activate
         export PSYCLONE_NEMO_DIR=${GITHUB_WORKSPACE}/examples/nemo/scripts
@@ -101,7 +101,7 @@ jobs:
     - name: NEMO 5.0 nvidia passthrough
       run: |
         # Set up environment
-        source /apps/spack/spack-upstream/share/spack/setup-env.sh
+        source /apps/spack/psyclone-spack/spack-repo/share/spack/setup-env.sh
         spack unload && spack load nemo-build-environment%[email protected]
         source .runner_venv/bin/activate
         export PSYCLONE_NEMO_DIR=${GITHUB_WORKSPACE}/examples/nemo/scripts
@@ -129,7 +129,7 @@ jobs:
     - name: NEMO 5.0 Intel passthrough
       run: |
         # Set up environment
-        source /apps/spack/spack-upstream/share/spack/setup-env.sh
+        source /apps/spack/psyclone-spack/spack-repo/share/spack/setup-env.sh
         spack unload && spack load nemo-build-environment%[email protected]
         source .runner_venv/bin/activate
         export PSYCLONE_NEMO_DIR=${GITHUB_WORKSPACE}/examples/nemo/scripts
@@ -157,7 +157,7 @@ jobs:
     - name: NEMO 5.0 Intel OpenMP for CPUs
       run: |
         # Set up environment
-        source /apps/spack/spack-upstream/share/spack/setup-env.sh
+        source /apps/spack/psyclone-spack/spack-repo/share/spack/setup-env.sh
         spack unload && spack load nemo-build-environment%[email protected]
         source .runner_venv/bin/activate
         export PSYCLONE_NEMO_DIR=${GITHUB_WORKSPACE}/examples/nemo/scripts
@@ -185,7 +185,7 @@ jobs:
     - name: NEMO 5.0 nvidia OpenMP for GPUs (managed memory)
       run: |
         # Set up environment
-        source /apps/spack/spack-upstream/share/spack/setup-env.sh
+        source /apps/spack/psyclone-spack/spack-repo/share/spack/setup-env.sh
         spack unload && spack load nemo-build-environment%[email protected]
         source .runner_venv/bin/activate
         export PSYCLONE_NEMO_DIR=${GITHUB_WORKSPACE}/examples/nemo/scripts