From ad3d7ac930e8109bec14a788548cdaf0d02e336d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 30 Apr 2024 13:43:03 +0200 Subject: [PATCH 1/6] easystack for debugging the hatchling rebuild issues --- .../2023.06/rebuilds/20240430-eb-4.9.1-hatchling-debug.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20240430-eb-4.9.1-hatchling-debug.yml diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240430-eb-4.9.1-hatchling-debug.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240430-eb-4.9.1-hatchling-debug.yml new file mode 100644 index 0000000000..d84b92ed15 --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240430-eb-4.9.1-hatchling-debug.yml @@ -0,0 +1,4 @@ +# 2024-04-30 +# Debug the issue observed in https://github.com/EESSI/software-layer/pull/546 +easyconfigs: + - hatchling-1.18.0-GCCcore-13.2.0.eb From 24472a1c7d12b780063e3dccb491905a536616ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 30 Apr 2024 13:50:27 +0200 Subject: [PATCH 2/6] add write permissions to install dir, then remove, and only remove contents of install dir --- EESSI-remove-software.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh index 446a156cb8..ac2dc398c7 100755 --- a/EESSI-remove-software.sh +++ b/EESSI-remove-software.sh @@ -112,7 +112,8 @@ if [ $EUID -eq 0 ]; then app_dir=${EASYBUILD_INSTALLPATH}/software/${app} app_module=${EASYBUILD_INSTALLPATH}/modules/all/${app}.lua echo_yellow "Removing ${app_dir} and ${app_module}..." - rm -rf ${app_dir} + chmod -R u+w ${app_dir} + rm -rf ${app_dir}/* rm -rf ${app_module} done else From 49abb4e14279486b6e0c14da211499043939a4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 30 Apr 2024 13:59:46 +0200 Subject: [PATCH 3/6] also need to rebuild Python --- .../2023.06/rebuilds/20240430-eb-4.9.1-hatchling-debug.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240430-eb-4.9.1-hatchling-debug.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240430-eb-4.9.1-hatchling-debug.yml index d84b92ed15..a86921f1af 100644 --- a/easystacks/software.eessi.io/2023.06/rebuilds/20240430-eb-4.9.1-hatchling-debug.yml +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240430-eb-4.9.1-hatchling-debug.yml @@ -1,4 +1,5 @@ # 2024-04-30 # Debug the issue observed in https://github.com/EESSI/software-layer/pull/546 easyconfigs: + - Python-3.11.5-GCCcore-13.2.0.eb - hatchling-1.18.0-GCCcore-13.2.0.eb From 74c311a7f3111c960c405f53a2b4bf822d953534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 30 Apr 2024 14:08:30 +0200 Subject: [PATCH 4/6] purge cvmfs cache after removal step --- bot/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bot/build.sh b/bot/build.sh index dcc61c19d4..6bef2c4bc1 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -213,6 +213,9 @@ else # this is important, as otherwise the removed software will still be there REMOVAL_TMPDIR=$(grep ' as tmp directory ' ${removal_outerr} | cut -d ' ' -f 2) BUILD_STEP_ARGS+=("--resume" "${REMOVAL_TMPDIR}") + + # purge cvmfs cache + rm -rf /tmp/bot/EESSI/eessi.8Pu3nrRvdR/var-lib-cvmfs/* fi # prepare directory to store tarball of tmp for build step From ae30b991fb0668c6af7778dd82ec29fec292ac0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 30 Apr 2024 14:14:48 +0200 Subject: [PATCH 5/6] try moving instead of removing --- EESSI-remove-software.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh index ac2dc398c7..33b46b061f 100755 --- a/EESSI-remove-software.sh +++ b/EESSI-remove-software.sh @@ -113,7 +113,8 @@ if [ $EUID -eq 0 ]; then app_module=${EASYBUILD_INSTALLPATH}/modules/all/${app}.lua echo_yellow "Removing ${app_dir} and ${app_module}..." chmod -R u+w ${app_dir} - rm -rf ${app_dir}/* + #rm -rf ${app_dir}/* + mv ${app_dir} ${app_dir}.orig rm -rf ${app_module} done else From a6a0ee40893fb42d00182c60ad41c1b8e6f0ef8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 30 Apr 2024 14:51:41 +0200 Subject: [PATCH 6/6] undo changes --- EESSI-remove-software.sh | 6 +++--- bot/build.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh index 33b46b061f..1eae19c572 100755 --- a/EESSI-remove-software.sh +++ b/EESSI-remove-software.sh @@ -112,9 +112,9 @@ if [ $EUID -eq 0 ]; then app_dir=${EASYBUILD_INSTALLPATH}/software/${app} app_module=${EASYBUILD_INSTALLPATH}/modules/all/${app}.lua echo_yellow "Removing ${app_dir} and ${app_module}..." - chmod -R u+w ${app_dir} - #rm -rf ${app_dir}/* - mv ${app_dir} ${app_dir}.orig + #chmod -R u+w ${app_dir} + rm -rf ${app_dir}/* + #mv ${app_dir} ${app_dir}.orig rm -rf ${app_module} done else diff --git a/bot/build.sh b/bot/build.sh index 6bef2c4bc1..c572eae3cc 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -215,7 +215,7 @@ else BUILD_STEP_ARGS+=("--resume" "${REMOVAL_TMPDIR}") # purge cvmfs cache - rm -rf /tmp/bot/EESSI/eessi.8Pu3nrRvdR/var-lib-cvmfs/* + # rm -rf /tmp/bot/EESSI/eessi.8Pu3nrRvdR/var-lib-cvmfs/* fi # prepare directory to store tarball of tmp for build step