From 0eaf730d0dce24507fc0520d1a9efd98467019f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 24 Nov 2025 10:00:54 +0100 Subject: [PATCH 1/3] take software layer suffix into account when creating a tarball --- bot/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/build.sh b/bot/build.sh index d414c5ac..5c9f1af0 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -312,8 +312,8 @@ export EESSI_DEV_PROJECT=${EESSI_DEV_PROJECT} TMP_IN_CONTAINER=/tmp echo "Executing command to create tarball:" echo "$software_layer_dir/eessi_container.sh ${COMMON_ARGS[@]} ${TARBALL_STEP_ARGS[@]}" -echo " -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET_OVERRIDE}\" /eessi_bot_job/${TARBALL} 2>&1 | tee -a ${tar_outerr}" +echo " -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} \"${EESSI_ACCELERATOR_TARGET_OVERRIDE}\" /eessi_bot_job/${TARBALL} 2>&1 | tee -a ${tar_outerr}" $software_layer_dir/eessi_container.sh "${COMMON_ARGS[@]}" "${TARBALL_STEP_ARGS[@]}" \ - -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "${EESSI_ACCELERATOR_TARGET_OVERRIDE}" /eessi_bot_job/${TARBALL} 2>&1 | tee -a ${tar_outerr} + -- $software_layer_dir/create_tarball.sh ${TMP_IN_CONTAINER} ${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE} "${EESSI_ACCELERATOR_TARGET_OVERRIDE}" /eessi_bot_job/${TARBALL} 2>&1 | tee -a ${tar_outerr} exit 0 From 9691705d67ba0ac237a9048adbddc5e3414af53b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 24 Nov 2025 10:07:00 +0100 Subject: [PATCH 2/3] easystack for testing --- .../software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-cowsay.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-cowsay.yml diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-cowsay.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-cowsay.yml new file mode 100644 index 00000000..44fe4d92 --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-cowsay.yml @@ -0,0 +1,2 @@ +easyconfigs: + - cowsay-3.04.eb From 39552a6eaa7220186b5f494df46fba411bfe11d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 24 Nov 2025 10:31:57 +0100 Subject: [PATCH 3/3] remove easystack again --- .../software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-cowsay.yml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-cowsay.yml diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-cowsay.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-cowsay.yml deleted file mode 100644 index 44fe4d92..00000000 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-cowsay.yml +++ /dev/null @@ -1,2 +0,0 @@ -easyconfigs: - - cowsay-3.04.eb