From 155a08ce8daa973c7e496e9ed719f77179471c2f Mon Sep 17 00:00:00 2001 From: Richard Top Date: Thu, 28 Sep 2023 11:00:10 +0000 Subject: [PATCH 1/4] added the _OVERRIDE value in test_eessi.yml --- .github/workflows/test_eessi.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index cf1395f199..60e86da99d 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -11,7 +11,7 @@ jobs: matrix: EESSI_VERSION: - 2023.06 - EESSI_SOFTWARE_SUBDIR: + EESSI_SOFTWARE_SUBDIR_OVERRIDE: - aarch64/generic - x86_64/amd/zen2 - x86_64/intel/broadwell @@ -41,7 +41,7 @@ jobs: eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux - export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}} + export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} env | grep ^EESSI | sort echo "just run check_missing_installations.sh (should use eessi-${{matrix.EESSI_VERSION}}.yml)" ./check_missing_installations.sh ${{matrix.EASYSTACK_FILE}} @@ -53,7 +53,7 @@ jobs: eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux - export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}} + export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} env | grep ^EESSI | sort echo "modify easystack file by adding a missing package (GCC/8.3.0)" echo " - GCC-8.3.0:" >> ${{matrix.EASYSTACK_FILE}} From 05f3817785dfd9cd4f6c2172d3ccb489a4ae5e65 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Thu, 28 Sep 2023 11:09:44 +0000 Subject: [PATCH 2/4] modified declaration and exection order in test_eessi.yml --- .github/workflows/test_eessi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index 60e86da99d..538732f3ce 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -37,11 +37,11 @@ jobs: - name: Test check_missing_installations.sh script run: | source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash + export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} module load EasyBuild eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux - export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} env | grep ^EESSI | sort echo "just run check_missing_installations.sh (should use eessi-${{matrix.EESSI_VERSION}}.yml)" ./check_missing_installations.sh ${{matrix.EASYSTACK_FILE}} @@ -49,11 +49,11 @@ jobs: - name: Test check_missing_installations.sh with missing package (GCC/8.3.0) run: | source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash + export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} module load EasyBuild eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux - export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} env | grep ^EESSI | sort echo "modify easystack file by adding a missing package (GCC/8.3.0)" echo " - GCC-8.3.0:" >> ${{matrix.EASYSTACK_FILE}} From f5f9e0d835b00c24b1c4091932223f39d224c5f3 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Thu, 28 Sep 2023 11:13:02 +0000 Subject: [PATCH 3/4] modified declaration and exection order in test_eessi.yml --- .github/workflows/test_eessi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index 538732f3ce..b42195c9ab 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -36,8 +36,8 @@ jobs: - name: Test check_missing_installations.sh script run: | - source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} + source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash module load EasyBuild eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} @@ -48,8 +48,8 @@ jobs: - name: Test check_missing_installations.sh with missing package (GCC/8.3.0) run: | - source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} + source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash module load EasyBuild eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} From 00337394dd8be8a72861a7436474e211dea85366 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Thu, 28 Sep 2023 11:41:32 +0000 Subject: [PATCH 4/4] which eb in test_eessi.yml --- .github/workflows/test_eessi.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index b42195c9ab..2fc071da8b 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -39,6 +39,7 @@ jobs: export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash module load EasyBuild + which eb eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux @@ -51,6 +52,7 @@ jobs: export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash module load EasyBuild + which eb eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux