Skip to content

Commit

Permalink
Update images
Browse files Browse the repository at this point in the history
Fedora 36 recently upgraded their GCC from 12.1 to 12.2. To make the buildcache useful,
the images need to be updated accordingly.
  • Loading branch information
blue42u committed Sep 4, 2022
1 parent 8336ffa commit a429ee8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions share/spack/gitlab/cloud_pipelines/stacks/hpctoolkit/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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
Expand All @@ -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',
Expand Down

0 comments on commit a429ee8

Please sign in to comment.