Merge pull request #16 from trz42/nessi-2023.06

build version NESSI/2023.06

.github/workflows/pilot_repo.yml

@@ -1,5 +1,5 @@
 # documentation: https://help.github.com/en/articles/workflow-syntax-for-github-actions
-name: Tests for EESSI pilot repo
+name: Tests for NESSI pilot repo
 on:
   push:
   pull_request:
@@ -17,10 +17,9 @@ jobs:
       matrix:
         EESSI_VERSION:
         # note: use string quotes here, to avoid values being interpreted as floating point values...
-        - '2021.12'
+        - '2023.06'
         EESSI_ARCH:
         - aarch64
-        - ppc64le
         - x86_64
         EESSI_OS:
         - linux
@@ -39,21 +38,21 @@ jobs:
         - name: Mount EESSI CernVM-FS pilot repository
           uses: cvmfs-contrib/github-action-cvmfs@d4641d0d591c9a5c3be23835ced2fb648b44c04b # v3.1
           with:
-              cvmfs_config_package: https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi_latest_all.deb
+              cvmfs_config_package: https://github.com/NorESSI/filesystem-layer/releases/download/latest/cvmfs-config-nessi_latest_all.deb
               cvmfs_http_proxy: DIRECT
-              cvmfs_repositories: pilot.eessi-hpc.org
+              cvmfs_repositories: pilot.nessi.no
 
-        - name: Check compat layer in EESSI pilot repository
+        - name: Check compat layer in NESSI pilot repository
           env:
-              EPREFIX: /cvmfs/pilot.eessi-hpc.org/versions/${{matrix.EESSI_VERSION}}/compat/linux/${{matrix.EESSI_ARCH}}
+              EPREFIX: /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/compat/linux/${{matrix.EESSI_ARCH}}
           run: |
               # trigger automount
-              echo '>> ls /cvmfs/pilot.eessi-hpc.org'
-              ls /cvmfs/pilot.eessi-hpc.org
+              echo '>> ls /cvmfs/pilot.nessi.no'
+              ls /cvmfs/pilot.nessi.no
 
               # check which Stratum 1 we're connected to
-              echo '>> cvmfs_config stat -v pilot.eessi-hpc.org'
-              cvmfs_config stat -v pilot.eessi-hpc.org
+              echo '>> cvmfs_config stat -v pilot.nessi.no'
+              cvmfs_config stat -v pilot.nessi.no
 
               echo '>> ls ${EPREFIX}/startprefix'
               ls ${EPREFIX}/startprefix

ansible/playbooks/README.md

@@ -39,7 +39,6 @@ Before running the playbook, make sure the following settings are correct, and o
 | gentoo_git_repo | URL to the git repository of the (official) Gentoo ebuild repository |
 | gentoo_git_commit | Git commit hash of the Gentoo ebuild repository to be used for the bootstrap |
 | prefix_required_space | Minimal amount of disk space that is required for the Gentoo Prefix bootstrap |
-| prefix_default_gcc | GCC compiler version to use as default compiler in Gentoo Prefix installation |
 | prefix_user_defined_trusted_dirs | List of paths to the user defined trusted dirs for glibc |
 | prefix_mask_packages | Contents of a [package.mask file](https://wiki.gentoo.org/wiki//etc/portage/package.mask) that should be used during the bootstrap |
 | prefix_unmask_packages | Contents of a [package.unmask file](https://wiki.gentoo.org/wiki//etc/portage/package.unmask) that should be used during the bootstrap |

ansible/playbooks/roles/compatibility_layer/defaults/main.yml

@@ -1,14 +1,14 @@
 # Defaults file for the compatibility layer role.
 ---
-eessi_version: "2023.04"
+eessi_version: "2023.06"
 
 custom_overlays:
   - name: eessi
     source: git
     url: https://github.com/EESSI/gentoo-overlay.git
     eclass-overrides: true
 
-cvmfs_repository: pilot.eessi-hpc.org
+cvmfs_repository: pilot.nessi.no
 
 gentoo_prefix_path: /cvmfs/{{ cvmfs_repository }}/versions/{{ eessi_version }}/compat/{{ eessi_host_os }}/{{ eessi_host_arch }}
 
@@ -17,18 +17,23 @@ gentoo_git_repo: https://github.com/gentoo/gentoo.git
 # Select a specific commit in the gentoo_git_repo that should be used for the bootstrap,
 # e.g. by checking: https://github.com/gentoo/gentoo/commits/master
 # April 17 (29492845e41ea6a0a4a9769c7e0ce287d106079b) commit is after fix for Lmod
-gentoo_git_commit: 29492845e41ea6a0a4a9769c7e0ce287d106079b
+# gentoo_git_commit: 29492845e41ea6a0a4a9769c7e0ce287d106079b
+# June 8 (aab8473aa90e0287553b3348a5c5b17872df4b7b) commit that was current when fetching luaposix
+gentoo_git_commit: aab8473aa90e0287553b3348a5c5b17872df4b7b
 prefix_required_space: 15 GB
-prefix_default_gcc: 9.5.0
 prefix_user_defined_trusted_dirs:
   - "/cvmfs/{{ cvmfs_repository }}/host_injections/{{ eessi_version }}/compat/{{ eessi_host_os }}/{{ eessi_host_arch }}/lib"
 prefix_mask_packages: |
-  # stick to GCC 9.x; using a too recent compiler in the compat layer complicates stuff in the software layer,
+  # stick to GCC 10.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
+  >=sys-devel/gcc-11
+  # mask OpenSSL 3.x, stick to OpenSSL 1.1.x for now to avoid problems with:
+  # - older versions of Rust (see https://github.com/EESSI/software-layer/issues/257)
+  # - older versions of cryptograhy in Python (see 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*
+  =sys-devel/gcc-10*
 prefix_bootstrap_use_flags: |
   # make sure that gold linker is installed with binutils
   sys-devel/binutils gold

ansible/playbooks/roles/compatibility_layer/tasks/prefix_configuration.yml

@@ -9,12 +9,3 @@
     state: present
   with_items: "{{ prefix_locales }}"
   notify: Generate locales
-
-# Set default compiler in compat layer.
-# We should not use the latest version of GCC here, since that will probably cause problems
-# when building older GCC versions with EasyBuild in the software layer.
-# (see https://github.com/EESSI/software-layer/issues/151).
-# Note: the selected GCC version must be installed (cfr. EESSI set in gentoo-overlay)
-- name: Make specific GCC version the default compiler
-  ansible.builtin.command: "{{ gentoo_prefix_path }}/usr/bin/gcc-config {{ prefix_default_gcc }}"
-  changed_when: false