diff options
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml | 42 | ||||
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml | 5 |
2 files changed, 43 insertions, 4 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index bd80a52921..a25ebdf067 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -111,15 +111,53 @@ default: allow_failure: True e4s-mac-pr-generate: - extends: [ ".e4s-mac", ".pr-generate"] + extends: [".e4s-mac", ".pr"] + stage: generate + script: + - tmp="$(mktemp -d)"; export SPACK_USER_CONFIG_PATH="$tmp"; export SPACK_USER_CACHE_PATH="$tmp" + - . "./share/spack/setup-env.sh" + - spack --version + - cd share/spack/gitlab/cloud_pipelines/stacks/${SPACK_CI_STACK_NAME} + - spack env activate --without-view . + - spack ci generate --check-index-only + --artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir" + --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/cloud-ci-pipeline.yml" + artifacts: + paths: + - "${CI_PROJECT_DIR}/jobs_scratch_dir" tags: - omicron + interruptible: true + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure timeout: 60 minutes e4s-mac-develop-generate: - extends: [ ".e4s-mac", ".develop-generate"] + extends: [".e4s-mac", ".develop"] + stage: generate + script: + - tmp="$(mktemp -d)"; export SPACK_USER_CONFIG_PATH="$tmp"; export SPACK_USER_CACHE_PATH="$tmp" + - . "./share/spack/setup-env.sh" + - spack --version + - cd share/spack/gitlab/cloud_pipelines/stacks/${SPACK_CI_STACK_NAME} + - spack env activate --without-view . + - spack ci generate --check-index-only + --artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir" + --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/cloud-ci-pipeline.yml" + artifacts: + paths: + - "${CI_PROJECT_DIR}/jobs_scratch_dir" tags: - omicron + interruptible: true + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure timeout: 60 minutes e4s-mac-pr-build: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml index 91bfde89f7..191639ca41 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml @@ -17,8 +17,8 @@ spack: definitions: - easy_specs: - - kokkos +openmp - - kokkos-kernels +openmp + - berkeley-db + - ncurses - arch: - '%apple-clang@13.0.0 target=m1' @@ -34,6 +34,7 @@ spack: gitlab-ci: script: + - tmp="$(mktemp -d)"; export SPACK_USER_CONFIG_PATH="$tmp"; export SPACK_USER_CACHE_PATH="$tmp" - . "./share/spack/setup-env.sh" - spack --version - cd ${SPACK_CONCRETE_ENV_DIR} |