diff --git a/cases/icon-test-euler/config.yaml b/cases/icon-test-euler/config.yaml index 28fd1269..b6f94b33 100644 --- a/cases/icon-test-euler/config.yaml +++ b/cases/icon-test-euler/config.yaml @@ -9,7 +9,7 @@ restart_step: PT6H startdate: 2018-01-01T00:00:00Z enddate: 2018-01-01T12:00:00Z -eccodes_dir: ./input/eccodes_definitions +eccodes_dir: ./ext/spack-c2sm/spack/opt/spack/linux-ubuntu22.04-broadwell/gcc-12.2.0//share/eccodes/definitions iconremap_bin: ./ext/icontools/icontools/iconremap iconsub_bin: ./ext/icontools/icontools/iconsub latbc_filename: ifs_201801_lbc.nc diff --git a/env/environment.yml b/env/environment.yml index 98b90e44..0070da5b 100644 --- a/env/environment.yml +++ b/env/environment.yml @@ -1,7 +1,6 @@ name: proc-chain channels: - conda-forge - - defaults dependencies: - python=3.11 - cdo diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 19875218..ba296f34 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -29,8 +29,10 @@ pipeline { sh 'wget -O ${WORKSPACE}/miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh' sh 'rm -fr ${WORKSPACE}/miniconda' sh 'bash miniconda.sh -b -p $WORKSPACE/miniconda' + sh 'conda config --remove channels defaults' sh 'conda config --set always_yes yes --set changeps1 no' sh 'conda config --add channels conda-forge' + sh 'conda config --set channel_priority strict' sh 'conda update -n base -c defaults conda' sh 'conda env create -f env/environment.yml' sh '''source ${WORKSPACE}/miniconda/etc/profile.d/conda.sh diff --git a/jenkins/scripts/build_icon-art.sh b/jenkins/scripts/build_icon-art.sh deleted file mode 100755 index 68d09fd2..00000000 --- a/jenkins/scripts/build_icon-art.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -set -e -x - -# Check if script is called correctly -[[ $(git rev-parse --show-toplevel 2>/dev/null) = $(pwd) ]] || error "$0 not launched from toplevel of repository" - -source jenkins/scripts/common.sh - -BRANCH=art -GIT_REMOTE=git@github.com:C2SM/icon.git -MODEL=icon-art - -pushd ext - -# Clone the repo if not already existing -if [[ ! -d "${MODEL}" ]]; then - git clone --depth 1 --recurse-submodules -b ${BRANCH} ${GIT_REMOTE} ${MODEL} -fi - -pushd ${MODEL} - -if [[ $(hostname) == eu-* ]]; then - ./jenkins/scripts/jenkins_euler.sh -b -fc gcc --configure euler.cpu.gcc.O2 -elif [[ $(hostname) == daint* ]]; then - SPACK_TAG=`cat config/cscs/SPACK_TAG_DAINT` - . ../spack-c2sm/setup-env.sh - spack env activate -d config/cscs/spack/${SPACK_TAG}/daint_cpu_nvhpc - spack install -u build -elif [[ $(hostname) == balfrin* ]]; then - SPACK_TAG=`cat config/cscs/SPACK_TAG_BALFRIN` - . ../spack-c2sm/setup-env.sh - spack env activate -d config/cscs/spack/${SPACK_TAG}/daint_cpu_nvhpc - spack install -u build -else - error "Unknown hostname: $(hostname)" -fi - -popd - -popd diff --git a/jenkins/scripts/jenkins.sh b/jenkins/scripts/jenkins.sh index 8fbe49ff..3eb4870b 100755 --- a/jenkins/scripts/jenkins.sh +++ b/jenkins/scripts/jenkins.sh @@ -21,11 +21,12 @@ set -e -x # Check if we are on Euler if [[ $(hostname) == eu-* ]]; then host=euler -elif [[ $(hostname) == daint* ]]; then - host=daint +elif [[ $(hostname) == santis* ]]; then + host=santis +else + echo "Unknown hostname: $(hostname)" fi - # Activate conda environment eval "$(conda shell.bash hook)" conda activate proc-chain @@ -85,14 +86,6 @@ else ./jenkins/scripts/build_icon.sh fi -# Build ICON-ART -if [[ -f ext/icon-art/bin/icon ]]; then - echo icon-art executable already exists - skipping build. -else - echo building icon-art... - ./jenkins/scripts/build_icon-art.sh -fi - # Test COSMO-GHG if [[ "$host" == euler ]]; then echo skipping cosmo-ghg test on Euler... diff --git a/jenkins/scripts/setup-spack.sh b/jenkins/scripts/setup-spack.sh index 76ed1a11..ccc10fde 100755 --- a/jenkins/scripts/setup-spack.sh +++ b/jenkins/scripts/setup-spack.sh @@ -11,15 +11,13 @@ SPACK_TAG_COSMO=v0.18.1.12 if [[ $(hostname) == eu-* ]]; then source /cluster/apps/local/env2lmod.sh - module load git/2.31.1 - SPACK_TAG=main -elif [[ $(hostname) == daint* ]]; then - git clone --depth 1 git@github.com:C2SM/icon.git icon-tag - SPACK_TAG=`cat icon-tag/config/cscs/SPACK_TAG_DAINT` + module load git + git clone --depth 1 git@gitlab.dkrz.de:icon/icon-model.git icon-tag + SPACK_TAG=`cat icon-tag/config/ethz/SPACK_TAG_EULER` rm -fr icon-tag -elif [[ $(hostname) == balfrin* ]]; then - git clone --depth 1 git@github.com:C2SM/icon.git icon-tag - SPACK_TAG=`cat icon-tag/config/cscs/SPACK_TAG_BALFRIN` +elif [[ $(hostname) == santis* ]]; then + git clone --depth 1 git@gitlab.dkrz.de:icon/icon-model.git icon-tag + SPACK_TAG=`cat icon-tag/config/cscs/SPACK_TAG_SANTIS` rm -fr icon-tag else error "Unknown hostname: $(hostname)"