diff options
| -rw-r--r-- | lib/spack/spack/schema/gitlab_ci.py | 2 | ||||
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/spack/spack/schema/gitlab_ci.py b/lib/spack/spack/schema/gitlab_ci.py index c95cd674d9..85acd9cc51 100644 --- a/lib/spack/spack/schema/gitlab_ci.py +++ b/lib/spack/spack/schema/gitlab_ci.py @@ -35,7 +35,7 @@ runner_attributes_schema_items = { runner_selector_schema = { "type": "object", - "additionalProperties": False, + "additionalProperties": True, "required": ["tags"], "properties": runner_attributes_schema_items, } diff --git a/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml index 17d5447c4d..017c3d9c70 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml @@ -62,6 +62,9 @@ spack: - match: - '@:' runner-attributes: + id_tokens: + GITLAB_OIDC_TOKEN: + aud: "${OIDC_TOKEN_AUDIENCE}" tags: [spack, public, small, x86_64] variables: CI_JOB_SIZE: small @@ -69,6 +72,9 @@ spack: KUBERNETES_CPU_REQUEST: 500m KUBERNETES_MEMORY_REQUEST: 500M signing-job-attributes: + id_tokens: + GITLAB_OIDC_TOKEN: + aud: "${OIDC_TOKEN_AUDIENCE}" image: {name: 'ghcr.io/spack/notary:latest', entrypoint: ['']} tags: [aws] script: @@ -80,6 +86,9 @@ spack: --recursive --exclude "*" --include "*.pub" service-job-attributes: + id_tokens: + GITLAB_OIDC_TOKEN: + aud: "${OIDC_TOKEN_AUDIENCE}" image: ghcr.io/spack/tutorial-ubuntu-18.04:v2021-11-02 before_script: - . "./share/spack/setup-env.sh" |