From ab606665301c27b731e7472dc6a360b55238f951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 27 May 2025 13:42:55 +0200 Subject: [PATCH 1/2] run check_missing_installations.sh with the right EB version --- .github/workflows/test-software.eessi.io.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml index aa0c9a9d71..319a733e4a 100644 --- a/.github/workflows/test-software.eessi.io.yml +++ b/.github/workflows/test-software.eessi.io.yml @@ -69,9 +69,6 @@ jobs: # set $EESSI_CPU_FAMILY to the CPU architecture that corresponds to $EESSI_SOFTWARE_SUBDIR_OVERRIDE (part before the first slash), # to prevent issues with checks in the Easybuild configuration that use this variable export EESSI_CPU_FAMILY=${EESSI_SOFTWARE_SUBDIR_OVERRIDE%%/*} - module load EasyBuild - which eb - eb --version export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${EESSI_VERSION} export EESSI_OS_TYPE=linux env | grep ^EESSI | sort @@ -79,7 +76,12 @@ jobs: # first check the CPU-only builds for this CPU target echo "just run check_missing_installations.sh (should use easystacks/software.eessi.io/${EESSI_VERSION}/eessi-${EESSI_VERSION}-*.yml with latest EasyBuild release)" for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} .github/workflows/scripts/only_latest_easystacks.sh); do - echo "check missing installations for ${easystack_file}..." + eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g') + echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..." + module purge + module load EasyBuild/${eb_version} + which eb + eb --version ./check_missing_installations.sh ${easystack_file} ec=$? if [[ ${ec} -ne 0 ]]; then echo "missing installations found for ${easystack_file}!" >&2; exit ${ec}; fi @@ -94,7 +96,12 @@ jobs: module use ${EESSI_SOFTWARE_PATH}/accel/${accel}/modules/all echo "checking missing installations for accelerator ${accel} using modulepath: ${MODULEPATH}" for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} ACCEL_EASYSTACKS=1 .github/workflows/scripts/only_latest_easystacks.sh); do - echo "check missing installations for ${easystack_file}..." + eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g') + echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..." + module purge + module load EasyBuild/${eb_version} + which eb + eb --version ./check_missing_installations.sh ${easystack_file} ec=$? if [[ ${ec} -ne 0 ]]; then echo "missing installations found for ${easystack_file}!" >&2; exit ${ec}; fi From 456101303a97648866b824ad2c2fe7da6308ac4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 27 May 2025 13:51:27 +0200 Subject: [PATCH 2/2] fix echo message --- .github/workflows/test-software.eessi.io.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml index 319a733e4a..bad2044aff 100644 --- a/.github/workflows/test-software.eessi.io.yml +++ b/.github/workflows/test-software.eessi.io.yml @@ -74,7 +74,7 @@ jobs: env | grep ^EESSI | sort # first check the CPU-only builds for this CPU target - echo "just run check_missing_installations.sh (should use easystacks/software.eessi.io/${EESSI_VERSION}/eessi-${EESSI_VERSION}-*.yml with latest EasyBuild release)" + echo "first run check_missing_installations.sh for CPU-only builds" for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} .github/workflows/scripts/only_latest_easystacks.sh); do eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g') echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..."