Skip to content
Snippets Groups Projects
Commit b73f0273 authored by Yen-Chen Chen's avatar Yen-Chen Chen Committed by Jonas Jucker
Browse files

Update ci (!90)


## What is the bug
Running pipelines on images cannot do tests with OpenACC.
## How do you fix it
Change the CI configuration to using the `levante` shared runner. This runner submits jobs on Levante directly with the CI script.  
`Check typos` CI is also fixed by specifying the conda channel to search for the package.

Merged-by: default avatarJonas Jucker <jonas.jucker@env.ethz.ch>
Changelog: bugfix
parent 0b246f19
No related branches found
No related tags found
1 merge request!90Update ci
Pipeline #69906 passed
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# --------------------------------------------------------------- # ---------------------------------------------------------------
include:
- project: 'anw_dienste/ci-templates'
file: '.slurm-ci.yml'
stages: stages:
- lint - lint
- build_and_test - build_and_test
...@@ -28,10 +32,16 @@ workflow: ...@@ -28,10 +32,16 @@ workflow:
DEFAULT: '\033[0m' DEFAULT: '\033[0m'
RED: '\033[0;31m' RED: '\033[0;31m'
variables:
ACCOUNT: "ka1125"
SCHEDULER_PARAMETERS: "--account=$ACCOUNT --partition=shared"
nag: nag:
stage: build_and_test stage: build_and_test
extends:
- .default
before_script: before_script:
- . /sw/etc/profile.levante && module use /sw/spack-levante/spack/modules && module list - module list
script: script:
- module load gcc/11.2.0-gcc-11.2.0 nag/7.1-gcc-11.2.0 - module load gcc/11.2.0-gcc-11.2.0 nag/7.1-gcc-11.2.0
- export NAG_KUSARI_FILE="/etc/nag-license" - export NAG_KUSARI_FILE="/etc/nag-license"
...@@ -41,13 +51,15 @@ nag: ...@@ -41,13 +51,15 @@ nag:
- make VERBOSE=1 - make VERBOSE=1
- ctest --output-on-failure - ctest --output-on-failure
tags: tags:
- levante-fake, hpc, dkrz - levante, hpc, dkrz
needs: ["Check Typo", "Check OpenACC Style", "Check Style", "Check CMake Style", "Check License"] needs: ["Check Typo", "Check OpenACC Style", "Check Style", "Check CMake Style", "Check License"]
gcc11: gcc11:
stage: build_and_test stage: build_and_test
extends:
- .default
before_script: before_script:
- . /sw/etc/profile.levante && module use /sw/spack-levante/spack/modules && module list - module list
script: script:
- module load gcc/11.2.0-gcc-11.2.0 - module load gcc/11.2.0-gcc-11.2.0
- mkdir gcc112 - mkdir gcc112
...@@ -56,13 +68,15 @@ gcc11: ...@@ -56,13 +68,15 @@ gcc11:
- make VERBOSE=1 - make VERBOSE=1
- ctest --output-on-failure - ctest --output-on-failure
tags: tags:
- levante-fake, hpc, dkrz - levante, hpc, dkrz
needs: ["Check Typo", "Check OpenACC Style", "Check Style", "Check CMake Style", "Check License"] needs: ["Check Typo", "Check OpenACC Style", "Check Style", "Check CMake Style", "Check License"]
intel22: intel22:
stage: build_and_test stage: build_and_test
extends:
- .default
before_script: before_script:
- . /sw/etc/profile.levante && module use /sw/spack-levante/spack/modules && module list - module list
script: script:
- module load gcc/11.2.0-gcc-11.2.0 intel-oneapi-compilers/2022.0.1-gcc-11.2.0 - module load gcc/11.2.0-gcc-11.2.0 intel-oneapi-compilers/2022.0.1-gcc-11.2.0
- mkdir intel22 - mkdir intel22
...@@ -71,13 +85,15 @@ intel22: ...@@ -71,13 +85,15 @@ intel22:
- make VERBOSE=1 - make VERBOSE=1
- ctest --output-on-failure - ctest --output-on-failure
tags: tags:
- levante-fake, hpc, dkrz - levante, hpc, dkrz
needs: ["Check Typo", "Check OpenACC Style", "Check Style", "Check CMake Style", "Check License"] needs: ["Check Typo", "Check OpenACC Style", "Check Style", "Check CMake Style", "Check License"]
nvhpc: nvhpc:
stage: build_and_test stage: build_and_test
extends:
- .default
before_script: before_script:
- . /sw/etc/profile.levante && module use /sw/spack-levante/spack/modules && module list - module list
script: script:
- module load gcc/11.2.0-gcc-11.2.0 nvhpc/22.5-gcc-11.2.0 - module load gcc/11.2.0-gcc-11.2.0 nvhpc/22.5-gcc-11.2.0
- mkdir nvhpc - mkdir nvhpc
...@@ -86,13 +102,15 @@ nvhpc: ...@@ -86,13 +102,15 @@ nvhpc:
- make VERBOSE=1 - make VERBOSE=1
- ctest --output-on-failure - ctest --output-on-failure
tags: tags:
- levante-fake, hpc, dkrz - levante, hpc, dkrz
needs: ["Check Typo", "Check OpenACC Style", "Check Style", "Check CMake Style", "Check License"] needs: ["Check Typo", "Check OpenACC Style", "Check Style", "Check CMake Style", "Check License"]
OpenACC: OpenACC:
stage: build_OpenACC stage: build_OpenACC
extends:
- .default
before_script: before_script:
- . /sw/etc/profile.levante && module use /sw/spack-levante/spack/modules && module list - module list
script: script:
- module load gcc/11.2.0-gcc-11.2.0 nvhpc/22.5-gcc-11.2.0 - module load gcc/11.2.0-gcc-11.2.0 nvhpc/22.5-gcc-11.2.0
- mkdir nvhpc - mkdir nvhpc
...@@ -100,14 +118,14 @@ OpenACC: ...@@ -100,14 +118,14 @@ OpenACC:
- /sw/spack-levante/cmake-3.23.1-q5kzz6/bin/cmake .. -DFS_ENABLE_OPENACC=ON -DCMAKE_C_COMPILER=nvc -DCMAKE_Fortran_COMPILER=nvfortran -DCMAKE_CXX_COMPILER=nvc++ - /sw/spack-levante/cmake-3.23.1-q5kzz6/bin/cmake .. -DFS_ENABLE_OPENACC=ON -DCMAKE_C_COMPILER=nvc -DCMAKE_Fortran_COMPILER=nvfortran -DCMAKE_CXX_COMPILER=nvc++
- make VERBOSE=1 - make VERBOSE=1
tags: tags:
- levante-fake, hpc, dkrz - levante, hpc, dkrz
needs: ["nvhpc"] needs: ["nvhpc"]
Check Typo: Check Typo:
stage: lint stage: lint
before_script: before_script:
# install typo check package # install typo check package
- conda install typos - conda install conda-forge::typos
script: typos script: typos
tags: tags:
# choose conda available runner # choose conda available runner
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment