Merge pull request #7 from boegel/EESSI_version_check

make sure that EESSI version for which build is triggered matches with location of easystack file + fix URL in `create_directory_tarballs.sh`

Author: ocaisa

EESSI-install-software.sh

@@ -358,6 +358,12 @@ else
     new_easystacks=$(echo "${changed_easystacks}" | (grep -v "/rebuilds/" || true))
     for easystack_file in ${rebuild_easystacks} ${new_easystacks}; do
 
+        # make sure that easystack file being picked up is for EESSI version that we're building for...
+        echo "${easystack_file}" | grep -q "^easystacks/${EESSI_VERSION}/"
+        if [ $? -ne 0 ]; then
+            fatal_error "Easystack file ${easystack_file} is not intended for EESSI version ${EESSI_VERSION}, giving up!"
+        fi
+
         echo -e "Processing easystack file ${easystack_file}...\n\n"
 
         # determine version of EasyBuild module to load based on EasyBuild version included in name of easystack file

create_directory_tarballs.sh

@@ -9,7 +9,7 @@ fi
 
 version=$1
 
-SOFTWARE_LAYER_TARBALL_URL="https://github.com/EESSI/software-layer/tarball/${version}-software.eessi.io"
+SOFTWARE_LAYER_SCRIPTS_TARBALL_URL="https://github.com/EESSI/software-layer-scripts/tarball/main"
 
 TOPDIR=$(dirname $(realpath $0))
 
@@ -26,7 +26,7 @@ fi
 tartmp=$(mktemp -t -d init.XXXXX)
 mkdir "${tartmp}/${version}"
 tarname="eessi-${version}-init-$(date +%s).tar.gz"
-curl -Ls ${SOFTWARE_LAYER_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/init/'
+curl -Ls ${SOFTWARE_LAYER_SCRIPTS_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/init/'
 source "${tartmp}/${version}/init/minimal_eessi_env"
 if [ "${EESSI_VERSION}" != "${version}" ]
 then
@@ -42,7 +42,7 @@ echo_green "Done! Created tarball ${tarname}."
 tartmp=$(mktemp -t -d scripts.XXXXX)
 mkdir "${tartmp}/${version}"
 tarname="eessi-${version}-scripts-$(date +%s).tar.gz"
-curl -Ls ${SOFTWARE_LAYER_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/scripts/'
+curl -Ls ${SOFTWARE_LAYER_SCRIPTS_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/scripts/'
 tar czf "${tarname}" -C "${tartmp}" "${version}"
 rm -rf "${tartmp}"