From aa6d35306a84654d23674e79b7e6d6788d39f664 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sun, 24 May 2026 08:20:05 +0200 Subject: [PATCH 1/3] Update tutorial image to use Ubuntu 26.04 Signed-off-by: Massimiliano Culpo --- .ci/gitlab/.gitlab-ci.yml | 2 +- stacks/tutorial/spack.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/gitlab/.gitlab-ci.yml b/.ci/gitlab/.gitlab-ci.yml index 4b8acc283b3..f117fcc005e 100644 --- a/.ci/gitlab/.gitlab-ci.yml +++ b/.ci/gitlab/.gitlab-ci.yml @@ -607,7 +607,7 @@ tools-sdk-build: tutorial-generate: extends: [ ".tutorial", ".generate-x86_64"] - image: ghcr.io/spack/tutorial-ubuntu-22.04:2026-03-10 + image: ghcr.io/spack/tutorial-ubuntu-26.04:pr-84 tutorial-build: extends: [ ".tutorial", ".build" ] diff --git a/stacks/tutorial/spack.yaml b/stacks/tutorial/spack.yaml index 53167dce4f5..5241ac624d0 100644 --- a/stacks/tutorial/spack.yaml +++ b/stacks/tutorial/spack.yaml @@ -73,7 +73,7 @@ spack: pipeline-gen: - build-job: image: - name: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-10-30 + name: ghcr.io/spack/tutorial-ubuntu-26.04:pr-84 entrypoint: [''] cdash: From 7c05b4fe26f5e37ef82954906492ebc9b7e9758e Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sun, 24 May 2026 08:22:40 +0200 Subject: [PATCH 2/3] Update tutorial specs Signed-off-by: Massimiliano Culpo --- stacks/tutorial/spack.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/stacks/tutorial/spack.yaml b/stacks/tutorial/spack.yaml index 5241ac624d0..9245cc71be7 100644 --- a/stacks/tutorial/spack.yaml +++ b/stacks/tutorial/spack.yaml @@ -14,9 +14,9 @@ spack: specs: - group: compiler specs: - - gcc@12 ~binutils + - gcc@16 build_type=Release +profiled +strip - - group: "gcc@11 specs" + - group: "gcc@15 specs" specs: - zlib-ng@2.2.4 - zlib-ng@2.0.7 @@ -37,11 +37,11 @@ spack: override: packages: c: - prefer: [gcc@11] + prefer: [gcc@15] cxx: - prefer: [gcc@11] + prefer: [gcc@15] fortran: - prefer: [gcc@11] + prefer: [gcc@15] - group: scalapacks needs: [compiler] @@ -55,16 +55,16 @@ spack: override: packages: c: - prefer: [gcc@12] + prefer: [gcc@16] cxx: - prefer: [gcc@12] + prefer: [gcc@16] fortran: - prefer: [gcc@12] + prefer: [gcc@16] # Miscellaneous specs use the default group - - zlib-ng@2.2.4%gcc@10 - - matrix: - - [ zlib-ng@2.2.4, tcl ^zlib-ng@2.0.7 ] - - [ '%clang@14' ] + # - zlib-ng@2.2.4%gcc@10 + #- matrix: + # - [ zlib-ng@2.2.4, tcl ^zlib-ng@2.0.7 ] + # - [ '%clang@14' ] concretizer: unify: false From acfc7b422e9ce33038eedf62258ac6206223b056 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Sat, 6 Jun 2026 11:08:21 +0200 Subject: [PATCH 3/3] Use shasum Co-authored-by: Massimiliano Culpo --- .ci/gitlab/.gitlab-ci.yml | 2 +- stacks/tutorial/spack.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/gitlab/.gitlab-ci.yml b/.ci/gitlab/.gitlab-ci.yml index f117fcc005e..8533babfeb5 100644 --- a/.ci/gitlab/.gitlab-ci.yml +++ b/.ci/gitlab/.gitlab-ci.yml @@ -607,7 +607,7 @@ tools-sdk-build: tutorial-generate: extends: [ ".tutorial", ".generate-x86_64"] - image: ghcr.io/spack/tutorial-ubuntu-26.04:pr-84 + image: ghcr.io/spack/tutorial-ubuntu-26.04:pr-84@sha256:62595582f6bcd19fac46186c1062cd8896f79cc23d5a3f5c87cc8a7e20d19202 tutorial-build: extends: [ ".tutorial", ".build" ] diff --git a/stacks/tutorial/spack.yaml b/stacks/tutorial/spack.yaml index 9245cc71be7..b094d18d934 100644 --- a/stacks/tutorial/spack.yaml +++ b/stacks/tutorial/spack.yaml @@ -73,7 +73,7 @@ spack: pipeline-gen: - build-job: image: - name: ghcr.io/spack/tutorial-ubuntu-26.04:pr-84 + name: ghcr.io/spack/tutorial-ubuntu-26.04:pr-84@sha256:62595582f6bcd19fac46186c1062cd8896f79cc23d5a3f5c87cc8a7e20d19202 entrypoint: [''] cdash: