From a429ee8b517c7c1a967fe30bde6a1608ef8ca667 Mon Sep 17 00:00:00 2001
From: blue42u <anderson.jonathonm@gmail.com>
Date: Mon, 29 Aug 2022 08:30:56 -0500
Subject: [PATCH] Update images

Fedora 36 recently upgraded their GCC from 12.1 to 12.2. To make the buildcache useful,
the images need to be updated accordingly.
---
 .../spack/gitlab/cloud_pipelines/.gitlab-ci.yml  |  8 ++++----
 .../cloud_pipelines/stacks/hpctoolkit/spack.yaml | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
index 65218d1f0bdda7..203294ce529739 100644
--- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
+++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
@@ -768,16 +768,16 @@ tutorial-protected-build:
     SPACK_CI_STACK_NAME: hpctoolkit
 .hpctoolkit-centos7:
   extends: .hpctoolkit
-  image: ghcr.io/blue42u/e4s-centos-7@sha256:d74305ded85bbdf2b3a995c84d70700832654581f6b4b0c9e28f435284e32833
+  image: ghcr.io/blue42u/e4s-centos-7@sha256:71fe0a4eb4b55d77af19178734c95ad5c80617478aa876be93df95f97bbb73dc
 .hpctoolkit-fedora36:
   extends: .hpctoolkit
-  image: ghcr.io/blue42u/e4s-fedora-36@sha256:98f097c8a15cc61132b83d32909ed5fe7f7fcd89283ee6ffc4698c7085744074
+  image: ghcr.io/blue42u/e4s-fedora-36@sha256:f42bf5d401bbdc1fca362f44685238342343295e20a9a74fbd48ba7f6ee6b318
 .hpctoolkit-leap15:
   extends: .hpctoolkit
-  image: ghcr.io/blue42u/e4s-leap-15@sha256:39154fa3a24af562576c3a490b27ac9eef9ee0884710cf91924ace18f809c98d
+  image: ghcr.io/blue42u/e4s-leap-15@sha256:f9d97dec9c4236c2a2971ec654b5a2f3cf6039ed38b4bbdf4c37ba8b3faaea98
 .hpctoolkit-almalinux8:
   extends: .hpctoolkit
-  image: ghcr.io/blue42u/e4s-almalinux-8@sha256:531f7efc206d916182590ce46637eaa06bffafc8382ef16ce498eb684bcae12e
+  image: ghcr.io/blue42u/e4s-almalinux-8@sha256:831b22010bf20f51f18090def8f91a4bf15c49421cbdcdfad574c05a23d653ed
 .hpctoolkit-ubuntu20.04:
   extends: .hpctoolkit
   image: ghcr.io/spack/e4s-ubuntu-20.04:v2022-03-21
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/hpctoolkit/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/hpctoolkit/spack.yaml
index 856f8cc2b5315e..c825e7f9b7969b 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/hpctoolkit/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/hpctoolkit/spack.yaml
@@ -111,19 +111,19 @@ spack:
 
       # - match: ['os=centos7']
       #   runner-attributes:
-      #     image: ghcr.io/blue42u/e4s-centos-7:latest@sha256:d74305ded85bbdf2b3a995c84d70700832654581f6b4b0c9e28f435284e32833
+      #     image: ghcr.io/blue42u/e4s-centos-7:latest@sha256:71fe0a4eb4b55d77af19178734c95ad5c80617478aa876be93df95f97bbb73dc
       #     tags: []
       # - match: ['os=fedora36']
       #   runner-attributes:
-      #     image: ghcr.io/blue42u/e4s-fedora-36:latest@sha256:98f097c8a15cc61132b83d32909ed5fe7f7fcd89283ee6ffc4698c7085744074
+      #     image: ghcr.io/blue42u/e4s-fedora-36:latest@sha256:f42bf5d401bbdc1fca362f44685238342343295e20a9a74fbd48ba7f6ee6b318
       #     tags: []
       # - match: ['os=opensuse_leap15']
       #   runner-attributes:
-      #     image: ghcr.io/blue42u/e4s-leap-15:latest@sha256:39154fa3a24af562576c3a490b27ac9eef9ee0884710cf91924ace18f809c98d
+      #     image: ghcr.io/blue42u/e4s-leap-15:latest@sha256:f9d97dec9c4236c2a2971ec654b5a2f3cf6039ed38b4bbdf4c37ba8b3faaea98
       #     tags: []
       # - match: ['os=almalinux8']
       #   runner-attributes:
-      #     image: ghcr.io/blue42u/e4s-almalinux-8:latest@sha256:531f7efc206d916182590ce46637eaa06bffafc8382ef16ce498eb684bcae12e
+      #     image: ghcr.io/blue42u/e4s-almalinux-8:latest@sha256:831b22010bf20f51f18090def8f91a4bf15c49421cbdcdfad574c05a23d653ed
       #     tags: []
       # - match: ['os=ubuntu20.04']
       #   runner-attributes:
@@ -319,7 +319,7 @@ spack:
         runner-attributes:
           image: &id001
             entrypoint: ['']
-            name: ghcr.io/blue42u/e4s-centos-7:latest@sha256:d74305ded85bbdf2b3a995c84d70700832654581f6b4b0c9e28f435284e32833
+            name: ghcr.io/blue42u/e4s-centos-7:latest@sha256:71fe0a4eb4b55d77af19178734c95ad5c80617478aa876be93df95f97bbb73dc
           tags: [spack, huge, x86_64_v3]
           variables: &id002 {CI_JOB_SIZE: huge, KUBERNETES_CPU_REQUEST: 11000m, KUBERNETES_MEMORY_REQUEST: 42G}
       - match: ['hipblas os=centos7 target=:graviton', 'llvm os=centos7 target=:graviton',
@@ -339,7 +339,7 @@ spack:
         runner-attributes:
           image: &id003
             entrypoint: ['']
-            name: ghcr.io/blue42u/e4s-fedora-36:latest@sha256:98f097c8a15cc61132b83d32909ed5fe7f7fcd89283ee6ffc4698c7085744074
+            name: ghcr.io/blue42u/e4s-fedora-36:latest@sha256:f42bf5d401bbdc1fca362f44685238342343295e20a9a74fbd48ba7f6ee6b318
           tags: [spack, huge, x86_64_v3]
           variables: *id002
       - match: ['hipblas os=fedora36 target=:graviton', 'llvm os=fedora36 target=:graviton',
@@ -360,7 +360,7 @@ spack:
         runner-attributes:
           image: &id004
             entrypoint: ['']
-            name: ghcr.io/blue42u/e4s-leap-15:latest@sha256:39154fa3a24af562576c3a490b27ac9eef9ee0884710cf91924ace18f809c98d
+            name: ghcr.io/blue42u/e4s-leap-15:latest@sha256:f9d97dec9c4236c2a2971ec654b5a2f3cf6039ed38b4bbdf4c37ba8b3faaea98
           tags: [spack, huge, x86_64_v3]
           variables: *id002
       - match: ['hipblas os=opensuse_leap15 target=:graviton', 'llvm os=opensuse_leap15
@@ -382,7 +382,7 @@ spack:
         runner-attributes:
           image: &id005
             entrypoint: ['']
-            name: ghcr.io/blue42u/e4s-almalinux-8:latest@sha256:531f7efc206d916182590ce46637eaa06bffafc8382ef16ce498eb684bcae12e
+            name: ghcr.io/blue42u/e4s-almalinux-8:latest@sha256:831b22010bf20f51f18090def8f91a4bf15c49421cbdcdfad574c05a23d653ed
           tags: [spack, huge, x86_64_v3]
           variables: *id002
       - match: ['hipblas os=almalinux8 target=:graviton', 'llvm os=almalinux8 target=:graviton',