summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorScott Wittenburg <scott.wittenburg@kitware.com>2024-10-23 12:50:55 -0600
committerGitHub <noreply@github.com>2024-10-23 12:50:55 -0600
commit1472dcace441eedc9c1cb72c00fa4f0d8b4fdc9c (patch)
tree47f9bf39660a17827f59f40d4927082400d55ee3 /share
parent755c113c164a15472185487b8dd7803155423567 (diff)
downloadspack-1472dcace441eedc9c1cb72c00fa4f0d8b4fdc9c.tar.gz
spack-1472dcace441eedc9c1cb72c00fa4f0d8b4fdc9c.tar.bz2
spack-1472dcace441eedc9c1cb72c00fa4f0d8b4fdc9c.tar.xz
spack-1472dcace441eedc9c1cb72c00fa4f0d8b4fdc9c.zip
ci: Remove deprecated logic from the ci module (#47062)
ci: Remove deprecated logic from the ci module Remove the following from the ci module, schema, and tests: - deprecated ci stack and handling of old ci config - deprecated mirror handling logic - support for artifacts buildcache - support for temporary storage url
Diffstat (limited to 'share')
-rw-r--r--share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml60
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml100
-rw-r--r--share/spack/spack-completion.bash2
-rw-r--r--share/spack/spack-completion.fish6
4 files changed, 2 insertions, 166 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
index ce905db007..8997ae5b24 100644
--- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
+++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
@@ -75,8 +75,6 @@ default:
.base-job:
variables:
PIPELINE_MIRROR_TEMPLATE: "single-src-protected-mirrors.yaml.in"
- # TODO: We can remove this when we drop the "deprecated" stack
- PUSH_BUILDCACHE_DEPRECATED: "${PROTECTED_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}/${SPACK_CI_STACK_NAME}"
SPACK_CI_CONFIG_ROOT: "${CI_PROJECT_DIR}/share/spack/gitlab/cloud_pipelines/configs"
SPACK_CI_SCRIPTS_ROOT: "${CI_PROJECT_DIR}/share/spack/gitlab/cloud_pipelines/scripts"
@@ -106,8 +104,6 @@ default:
when: always
variables:
SPACK_PIPELINE_TYPE: "spack_pull_request"
- # TODO: We can remove this when we drop the "deprecated" stack
- PUSH_BUILDCACHE_DEPRECATED: "${PR_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}/${SPACK_CI_STACK_NAME}"
SPACK_PRUNE_UNTOUCHED: "True"
SPACK_PRUNE_UNTOUCHED_DEPENDENT_DEPTH: "1"
# TODO: Change sync script to include target in branch name. Then we could
@@ -221,41 +217,6 @@ default:
tags: ["spack", "public", "medium", "x86_64-win"]
image: "ghcr.io/johnwparent/windows-server21h2:sha-1c12b61"
-.generate-deprecated:
- extends: [ ".base-job" ]
- stage: generate
- script:
- - uname -a || true
- - grep -E 'vendor|model name' /proc/cpuinfo 2>/dev/null | sort -u || head -n10 /proc/cpuinfo 2>/dev/null || true
- - nproc || true
- - cat /proc/loadavg || true
- - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true
- - . "./share/spack/setup-env.sh"
- - spack --version
- - cd share/spack/gitlab/cloud_pipelines/stacks/${SPACK_CI_STACK_NAME}
- - spack env activate --without-view .
- - spack -v --color=always
- ci generate --check-index-only
- --buildcache-destination "${PUSH_BUILDCACHE_DEPRECATED}"
- --artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir"
- --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/cloud-ci-pipeline.yml"
- after_script:
- - cat /proc/loadavg || true
- - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true
- artifacts:
- paths:
- - "${CI_PROJECT_DIR}/jobs_scratch_dir"
- variables:
- KUBERNETES_CPU_REQUEST: 4000m
- KUBERNETES_MEMORY_REQUEST: 16G
- interruptible: true
- timeout: 60 minutes
- retry:
- max: 2
- when:
- - always
- tags: ["spack", "public", "medium", "x86_64"]
-
.build:
extends: [ ".base-job" ]
stage: build
@@ -798,27 +759,6 @@ ml-darwin-aarch64-mps-build:
job: ml-darwin-aarch64-mps-generate
########################################
-# Deprecated CI testing
-########################################
-.deprecated-ci:
- variables:
- SPACK_CI_STACK_NAME: deprecated
-
-deprecated-ci-generate:
- extends: [ ".generate-deprecated", ".deprecated-ci" ]
-
-deprecated-ci-build:
- extends: [ ".build", ".deprecated-ci" ]
- trigger:
- include:
- - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
- job: deprecated-ci-generate
- strategy: depend
- needs:
- - artifacts: True
- job: deprecated-ci-generate
-
-########################################
# AWS ParallelCluster
########################################
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml
deleted file mode 100644
index a97606302d..0000000000
--- a/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-###
-# Spack pipeline for testing deprecated gitlab-ci configuration
-###
-spack:
- view: false
- concretizer:
- reuse: false
- unify: false
- config:
- db_lock_timeout: 120
- install_tree:
- padded_length: 256
- projections:
- all: '{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'
- deprecated: true
- packages:
- all:
- require: target=x86_64
- specs:
- - readline
-
- mirrors:
- mirror: s3://spack-binaries/develop/deprecated
- gitlab-ci:
- broken-tests-packages:
- - gptune
- broken-specs-url: s3://spack-binaries/broken-specs
- image: ghcr.io/spack/tutorial-ubuntu-18.04:v2021-11-02
- before_script:
- - uname -a || true
- - grep -E "vendor|model name" /proc/cpuinfo 2>/dev/null | sort -u || head -n10
- /proc/cpuinfo 2>/dev/null || true
- - nproc
- - . "./share/spack/setup-env.sh"
- - spack --version
- - spack arch
- - cat /proc/loadavg || true
- - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true
- script:
- - spack compiler find
- - cd ${SPACK_CONCRETE_ENV_DIR}
- - spack env activate --without-view .
- - if [ -n "$SPACK_BUILD_JOBS" ]; then spack config add "config:build_jobs:$SPACK_BUILD_JOBS";
- fi
- - spack config add "config:install_tree:projections:${SPACK_JOB_SPEC_PKG_NAME}:'morepadding/{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}'"
- - mkdir -p ${SPACK_ARTIFACTS_ROOT}/user_data
- # AWS runners mount E4S public key (verification), UO runners mount public/private (signing/verification)
- - if [[ -r /mnt/key/e4s.gpg ]]; then spack gpg trust /mnt/key/e4s.gpg; fi
- # UO runners mount intermediate ci public key (verification), AWS runners mount public/private (signing/verification)
- - if [[ -r /mnt/key/intermediate_ci_signing_key.gpg ]]; then spack gpg trust /mnt/key/intermediate_ci_signing_key.gpg;
- fi
- - if [[ -r /mnt/key/spack_public_key.gpg ]]; then spack gpg trust /mnt/key/spack_public_key.gpg;
- fi
- - spack --color=always --backtrace ci rebuild --tests > >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_out.txt)
- 2> >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_err.txt >&2)
- after_script:
- - cat /proc/loadavg || true
- - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true
- match_behavior: first
- mappings:
- - match:
- - '@:'
- runner-attributes:
- id_tokens:
- GITLAB_OIDC_TOKEN:
- aud: "${OIDC_TOKEN_AUDIENCE}"
- tags: [spack, public, small, x86_64]
- variables:
- CI_JOB_SIZE: small
- SPACK_BUILD_JOBS: '1'
- 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:
- - aws s3 sync --exclude "*" --include "*spec.json*" ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache
- /tmp
- - /sign.sh
- - aws s3 sync --exclude "*" --include "*spec.json.sig*" /tmp ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache
- - aws s3 cp /tmp/public_keys ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/_pgp
- --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"
- - spack --version
- tags: [spack, public, x86_64]
- cdash:
- build-group: Spack Deprecated CI
- url: https://cdash.spack.io
- project: Spack Testing
- site: Cloud Gitlab Infrastructure
diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash
index 2bb52ecc05..2994de4b27 100644
--- a/share/spack/spack-completion.bash
+++ b/share/spack/spack-completion.bash
@@ -693,7 +693,7 @@ _spack_ci() {
}
_spack_ci_generate() {
- SPACK_COMPREPLY="-h --help --output-file --copy-to --optimize --dependencies --buildcache-destination --prune-dag --no-prune-dag --check-index-only --artifacts-root"
+ SPACK_COMPREPLY="-h --help --output-file --optimize --dependencies --prune-dag --no-prune-dag --check-index-only --artifacts-root"
}
_spack_ci_rebuild_index() {
diff --git a/share/spack/spack-completion.fish b/share/spack/spack-completion.fish
index ec13420a8d..57533497b9 100644
--- a/share/spack/spack-completion.fish
+++ b/share/spack/spack-completion.fish
@@ -955,19 +955,15 @@ complete -c spack -n '__fish_spack_using_command ci' -s h -l help -f -a help
complete -c spack -n '__fish_spack_using_command ci' -s h -l help -d 'show this help message and exit'
# spack ci generate
-set -g __fish_spack_optspecs_spack_ci_generate h/help output-file= copy-to= optimize dependencies buildcache-destination= prune-dag no-prune-dag check-index-only artifacts-root=
+set -g __fish_spack_optspecs_spack_ci_generate h/help output-file= optimize dependencies prune-dag no-prune-dag check-index-only artifacts-root=
complete -c spack -n '__fish_spack_using_command ci generate' -s h -l help -f -a help
complete -c spack -n '__fish_spack_using_command ci generate' -s h -l help -d 'show this help message and exit'
complete -c spack -n '__fish_spack_using_command ci generate' -l output-file -r -f -a output_file
complete -c spack -n '__fish_spack_using_command ci generate' -l output-file -r -d 'pathname for the generated gitlab ci yaml file'
-complete -c spack -n '__fish_spack_using_command ci generate' -l copy-to -r -f -a copy_to
-complete -c spack -n '__fish_spack_using_command ci generate' -l copy-to -r -d 'path to additional directory for job files'
complete -c spack -n '__fish_spack_using_command ci generate' -l optimize -f -a optimize
complete -c spack -n '__fish_spack_using_command ci generate' -l optimize -d '(DEPRECATED) optimize the gitlab yaml file for size'
complete -c spack -n '__fish_spack_using_command ci generate' -l dependencies -f -a dependencies
complete -c spack -n '__fish_spack_using_command ci generate' -l dependencies -d '(DEPRECATED) disable DAG scheduling (use '"'"'plain'"'"' dependencies)'
-complete -c spack -n '__fish_spack_using_command ci generate' -l buildcache-destination -r -f -a buildcache_destination
-complete -c spack -n '__fish_spack_using_command ci generate' -l buildcache-destination -r -d 'override the mirror configured in the environment'
complete -c spack -n '__fish_spack_using_command ci generate' -l prune-dag -f -a prune_dag
complete -c spack -n '__fish_spack_using_command ci generate' -l prune-dag -d 'skip up-to-date specs'
complete -c spack -n '__fish_spack_using_command ci generate' -l no-prune-dag -f -a prune_dag