From 79c92062a8626a27bfdfced67b3e917d9ff8ca72 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 19 Oct 2021 14:38:39 +0200 Subject: Gitlab pipelines: use images from the Spack organization (#26796) --- share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml | 2 +- .../spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml | 4 ++-- share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml | 5 ++--- share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml | 8 +++----- share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml | 6 +++--- share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml | 4 ++-- var/spack/repos/builtin/packages/openjpeg/package.py | 1 + 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index feaa8a875a..04c260998b 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -1,7 +1,7 @@ stages: [ "generate", "build" ] default: - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] } ######################################## # Job templates diff --git a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml index 15f6d989d8..481a03e651 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml @@ -40,7 +40,7 @@ spack: mappings: - match: [ 'os=ubuntu18.04' ] runner-attributes: - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2020-09-01", "entrypoint": [ "" ] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [ "" ] } tags: [ "spack", "public", "large", "x86_64" ] temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" @@ -49,7 +49,7 @@ spack: before_script: - . "./share/spack/setup-env.sh" - spack --version - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2020-09-01", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] } tags: ["spack", "public", "medium", "x86_64"] cdash: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml index 035d8d92ba..1ea9967348 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml @@ -30,7 +30,7 @@ spack: mirrors: { "mirror": "s3://spack-binaries-develop/data-vis-sdk" } gitlab-ci: - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] } script: - . "./share/spack/setup-env.sh" - spack --version @@ -48,7 +48,7 @@ spack: temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" broken-specs-url: "s3://spack-binaries-develop/broken-specs" service-job-attributes: - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] } before_script: - . "./share/spack/setup-env.sh" - spack --version @@ -59,4 +59,3 @@ spack: url: https://cdash.spack.io project: Spack Testing site: Cloud Gitlab Infrastructure - diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml index 958cb628bf..5822860c04 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml @@ -345,11 +345,11 @@ spack: - vtk-m - warpx runner-attributes: - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu20.04-runner-ppc64le:2021-07-01", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-20.04:v2021-10-18", "entrypoint": [""] } tags: ["spack", "public", "xlarge", "ppc64le"] - match: ['os=ubuntu20.04'] runner-attributes: - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu20.04-runner-ppc64le:2021-07-01", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-20.04:v2021-10-18", "entrypoint": [""] } tags: ["spack", "public", "large", "ppc64le"] temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" broken-specs-url: "s3://spack-binaries-develop/broken-specs" @@ -357,7 +357,7 @@ spack: before_script: - . "./share/spack/setup-env.sh" - spack --version - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu20.04-runner-ppc64le:2021-07-01", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-20.04:v2021-10-18", "entrypoint": [""] } tags: ["spack", "public", "medium", "ppc64le"] cdash: @@ -365,5 +365,3 @@ spack: url: https://cdash.spack.io project: Spack Testing site: Cloud Gitlab Infrastructure - - diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml index 4ab2c0a923..183195a565 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml @@ -361,11 +361,11 @@ spack: - vtk-m - warpx runner-attributes: - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] } tags: ["spack", "public", "xlarge", "x86_64"] - match: ['os=ubuntu18.04'] runner-attributes: - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] } tags: ["spack", "public", "large", "x86_64"] temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" broken-specs-url: "s3://spack-binaries-develop/broken-specs" @@ -373,7 +373,7 @@ spack: before_script: - . "./share/spack/setup-env.sh" - spack --version - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] } tags: ["spack", "public", "medium", "x86_64"] cdash: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml index fbaa97a2a8..f451ceeed3 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml @@ -59,7 +59,7 @@ spack: - [$compilers] gitlab-ci: - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] } script: - . "./share/spack/setup-env.sh" - spack --version @@ -79,7 +79,7 @@ spack: before_script: - . "./share/spack/setup-env.sh" - spack --version - image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] } + image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] } tags: ["spack", "public", "medium", "x86_64"] cdash: diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py index 676c567e35..a6b628f3f1 100644 --- a/var/spack/repos/builtin/packages/openjpeg/package.py +++ b/var/spack/repos/builtin/packages/openjpeg/package.py @@ -19,6 +19,7 @@ class Openjpeg(CMakePackage): homepage = 'https://github.com/uclouvain/openjpeg' url = 'https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz' + version('2.4.0', sha256='8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d') version('2.3.1', sha256='63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9') version('2.3.0', sha256='3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a') version('2.2.0', sha256='6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b') -- cgit v1.2.3-60-g2f50