From d6fb3eb21da925e74e9eb438496043d7e6d34478 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Wed, 7 Jun 2023 10:01:17 +0000 Subject: [PATCH 1/7] bumbing version to 2023.06 and masking OpenSSL to older than v3.* --- .../playbooks/roles/compatibility_layer/defaults/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml index 99501e22..8780b33e 100644 --- a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml +++ b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml @@ -1,6 +1,6 @@ # Defaults file for the compatibility layer role. --- -eessi_version: "2023.04" +eessi_version: "2023.06" custom_overlays: - name: eessi @@ -26,6 +26,9 @@ prefix_mask_packages: | # stick to GCC 9.x; using a too recent compiler in the compat layer complicates stuff in the software layer, # see for example https://github.com/EESSI/software-layer/issues/151 >=sys-devel/gcc-10 + # see https://github.com/EESSI/software-layer/issues/257 + # and https://github.com/EESSI/software-layer/issues/258 + Date: Wed, 7 Jun 2023 11:05:52 +0000 Subject: [PATCH 2/7] bump version to 2023.06 + mask OpenSSL versions 3.* --- .../playbooks/roles/compatibility_layer/defaults/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml index 99501e22..8780b33e 100644 --- a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml +++ b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml @@ -1,6 +1,6 @@ # Defaults file for the compatibility layer role. --- -eessi_version: "2023.04" +eessi_version: "2023.06" custom_overlays: - name: eessi @@ -26,6 +26,9 @@ prefix_mask_packages: | # stick to GCC 9.x; using a too recent compiler in the compat layer complicates stuff in the software layer, # see for example https://github.com/EESSI/software-layer/issues/151 >=sys-devel/gcc-10 + # see https://github.com/EESSI/software-layer/issues/257 + # and https://github.com/EESSI/software-layer/issues/258 + Date: Wed, 7 Jun 2023 17:38:55 +0000 Subject: [PATCH 3/7] use trz42/gentoo-overlay --- ansible/playbooks/roles/compatibility_layer/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml index 8780b33e..deb941f9 100644 --- a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml +++ b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml @@ -5,7 +5,7 @@ eessi_version: "2023.06" custom_overlays: - name: eessi source: git - url: https://github.com/EESSI/gentoo-overlay.git + url: https://github.com/trz42/gentoo-overlay.git eclass-overrides: true cvmfs_repository: pilot.eessi-hpc.org From be96c7611b9eec92a76fbee151a80c308f416a89 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Wed, 7 Jun 2023 17:53:14 +0000 Subject: [PATCH 4/7] fix package mask for OpenSSL --- ansible/playbooks/roles/compatibility_layer/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml index deb941f9..918aae35 100644 --- a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml +++ b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml @@ -28,7 +28,7 @@ prefix_mask_packages: | >=sys-devel/gcc-10 # see https://github.com/EESSI/software-layer/issues/257 # and https://github.com/EESSI/software-layer/issues/258 - Date: Wed, 7 Jun 2023 17:56:16 +0000 Subject: [PATCH 5/7] use trz42/gentoo-overlay + fix package mask for OpenSSL --- ansible/playbooks/roles/compatibility_layer/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml index 8780b33e..918aae35 100644 --- a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml +++ b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml @@ -5,7 +5,7 @@ eessi_version: "2023.06" custom_overlays: - name: eessi source: git - url: https://github.com/EESSI/gentoo-overlay.git + url: https://github.com/trz42/gentoo-overlay.git eclass-overrides: true cvmfs_repository: pilot.eessi-hpc.org @@ -28,7 +28,7 @@ prefix_mask_packages: | >=sys-devel/gcc-10 # see https://github.com/EESSI/software-layer/issues/257 # and https://github.com/EESSI/software-layer/issues/258 - Date: Wed, 7 Jun 2023 20:25:15 +0200 Subject: [PATCH 6/7] fix masking of OpenSSL 3.* --- .../playbooks/roles/compatibility_layer/defaults/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml index 918aae35..847f8ac3 100644 --- a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml +++ b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml @@ -26,9 +26,10 @@ prefix_mask_packages: | # stick to GCC 9.x; using a too recent compiler in the compat layer complicates stuff in the software layer, # see for example https://github.com/EESSI/software-layer/issues/151 >=sys-devel/gcc-10 - # see https://github.com/EESSI/software-layer/issues/257 - # and https://github.com/EESSI/software-layer/issues/258 - =dev-libs/openssl-3 prefix_unmask_packages: | # unmask older GCC to make it installable =sys-devel/gcc-9* From 7c935f98d303972af80f1ce4f78d9036279b1d6e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 7 Jun 2023 20:25:29 +0200 Subject: [PATCH 7/7] bump EESSI version to 2023.06 --- bot/build.sh | 2 +- install_compatibility_layer.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/build.sh b/bot/build.sh index 9995db52..0bc2584b 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -81,7 +81,7 @@ host_arch=$(uname -m) eessi_arch=${cpu_target_arch:-${host_arch}} eessi_os=linux job_version=$(cfg_get_value "repository" "repo_version") -eessi_version=${job_version:-2023.04} +eessi_version=${job_version:-2023.06} job_repo=$(cfg_get_value "repository" "repo_name") eessi_repo=${job_repo:-pilot.eessi-hpc.org} tar_topdir=/cvmfs/${eessi_repo}/versions diff --git a/install_compatibility_layer.sh b/install_compatibility_layer.sh index 84e8edee..b621dccb 100755 --- a/install_compatibility_layer.sh +++ b/install_compatibility_layer.sh @@ -10,7 +10,7 @@ REPOSITORY="pilot.eessi-hpc.org" RESUME= RETAIN_TMP=0 STORAGE= -VERSION=2023.04 +VERSION=2023.06 VERBOSE= display_help() {