build: move duplicate-node policy into Spack concretizer configs#275
Open
Copilot wants to merge 8 commits into
Open
build: move duplicate-node policy into Spack concretizer configs#275Copilot wants to merge 8 commits into
Copilot wants to merge 8 commits into
Conversation
Agent-Logs-Url: https://github.com/eic/containers/sessions/d3ab981b-e2cf-4c22-a919-9eb07c60f3b0 Co-authored-by: wdconinc <4656391+wdconinc@users.noreply.github.com>
Agent-Logs-Url: https://github.com/eic/containers/sessions/d3ab981b-e2cf-4c22-a919-9eb07c60f3b0 Co-authored-by: wdconinc <4656391+wdconinc@users.noreply.github.com>
Agent-Logs-Url: https://github.com/eic/containers/sessions/d3ab981b-e2cf-4c22-a919-9eb07c60f3b0 Co-authored-by: wdconinc <4656391+wdconinc@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
wdconinc
May 9, 2026 22:37
View session
Contributor
Access restrictions resolved. |
wdconinc
reviewed
May 9, 2026
wdconinc
reviewed
May 9, 2026
wdconinc
reviewed
May 9, 2026
wdconinc
reviewed
May 9, 2026
wdconinc
reviewed
May 9, 2026
wdconinc
reviewed
May 9, 2026
wdconinc
reviewed
May 9, 2026
wdconinc
reviewed
May 9, 2026
wdconinc
reviewed
May 9, 2026
wdconinc
reviewed
May 9, 2026
wdconinc
reviewed
May 9, 2026
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR moves the “allowed duplicate packages” policy from ad-hoc Docker build args/CI wiring into Spack’s environment-level concretizer.duplicates.max_dupes configuration, aiming to make concretization behavior declarative per environment and remove CI-specific duplication checks.
Changes:
- Add
concretizer.duplicates.max_dupesto the affected Spack environments and removeconcretizer.unify: when_possibleoverrides. - Remove
SPACK_DUPLICATE_ALLOWLISTplumbing from the Dockerfile and CI (GitHub Actions + GitLab). - Update docs/instructions to describe the new duplicate configuration approach.
Reviewed changes
Copilot reviewed 14 out of 14 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| spack-environment/ci/spack.yaml | Adds per-environment duplicates.max_dupes settings for CI concretization. |
| spack-environment/ci_without_acts/spack.yaml | Adds per-environment duplicates.max_dupes settings for the CI variant env. |
| spack-environment/cvmfs/spack.yaml | Adds per-environment duplicates.max_dupes settings for the cvmfs env. |
| spack-environment/tf/spack.yaml | Adds per-environment duplicates.max_dupes for TF env duplicates (llvm + python deps). |
| spack-environment/tf/epic/spack.yaml | Adds per-environment duplicates.max_dupes for the TF epic layered env. |
| spack-environment/xl/epic/spack.yaml | Adds per-environment duplicates.max_dupes for epic multi-version needs in xl epic env. |
| spack-environment/cuda/epic/spack.yaml | Adds per-environment duplicates.max_dupes for epic multi-version needs in cuda epic env. |
| spack-environment/concretizer.yaml | Updates commentary around concretizer behavior and keeps global unify: true. |
| containers/eic/Dockerfile | Removes duplicate-allowlist ARG and the custom duplicate-check logic after concretization. |
| .github/workflows/build-push.yml | Removes the matrix variable and build-arg passing for SPACK_DUPLICATE_ALLOWLIST. |
| .gitlab-ci.yml | Removes the SPACK_DUPLICATE_ALLOWLIST build-arg generation/passing. |
| docs/spack-environment.md | Documents environment-level duplicates.max_dupes configuration with an example. |
| AGENTS.md | Updates contributor validation instructions to reference env duplicates.max_dupes settings. |
| .github/copilot-instructions.md | Updates guidance to account for env-level duplicate allowances. |
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 14 out of 14 changed files in this pull request and generated 6 comments.
Comments suppressed due to low confidence (2)
.github/workflows/build-push.yml:394
- This workflow no longer passes a duplicate allowlist into the Docker build. For the
ENV: xlbuilds here, any allowed duplicate nodes must now be configured inspack-environment/xl/spack.yamlviaconcretizer.duplicates.max_dupes—but that file currently has noconcretizer: duplicates:section. Add the necessarymax_dupesentries (or ensure thexlenvironment concretizes without duplicates).
- BUILD_IMAGE: eic_
BUILD_TYPE: default
BUILDER_IMAGE: debian_stable_base
RUNTIME_IMAGE: debian_stable_base
ENV: xl
.github/workflows/build-push.yml:421
- This workflow no longer passes a duplicate allowlist into the Docker build. For the
ENV: cudaconcretization build here, any allowed duplicate nodes must now be configured inspack-environment/cuda/spack.yamlviaconcretizer.duplicates.max_dupes—but that file currently has noconcretizer: duplicates:section. Add the necessarymax_dupesentries (or ensure thecudaenvironment concretizes without duplicates).
- BUILD_IMAGE: eic_
BUILD_TYPE: default
BUILDER_IMAGE: cuda_devel
RUNTIME_IMAGE: cuda_devel
ENV: cuda
Comment on lines
479
to
483
| --build-arg JUGGLER_SHA=$(sh .ci/resolve_git_ref eic/juggler ${JUGGLER_VERSION:-main}) | ||
| } | ||
| --build-arg ENV=${ENV} | ||
| --build-arg SPACK_DUPLICATE_ALLOWLIST=$( | ||
| case "${ENV}" in | ||
| ci|ci_without_acts|cuda|dbg|jl|prod) | ||
| echo "epic|llvm|py-setuptools|py-urllib3" ;; | ||
| xl|tf) | ||
| echo "epic|llvm|py-setuptools|py-urllib3|py-dask|py-dask-awkward|py-dask-histogram|py-distributed|py-requests" ;; | ||
| *) | ||
| echo "epic|llvm|py-setuptools|py-urllib3" ;; | ||
| esac | ||
| ) | ||
| --build-arg jobs=${JOBS} | ||
| --build-context spack-environment=spack-environment |
| - **`unify: true`**: Single version of each package in environment | ||
| - **`reuse: false`**: Don't reuse packages from buildcache during concretization | ||
|
|
||
| Environment-specific duplicate allowances are configured in each environment `spack.yaml`: |
Comment on lines
+10
to
+17
| llvm: 2 | ||
| py-setuptools: 2 | ||
| py-urllib3: 2 | ||
| py-dask: 2 | ||
| py-dask-awkward: 2 | ||
| py-dask-histogram: 2 | ||
| py-distributed: 2 | ||
| py-requests: 2 |
Comment on lines
+9
to
+10
| max_dupes: | ||
| llvm: 2 |
Comment on lines
+12
to
+15
| epic: 10 | ||
| llvm: 2 | ||
| py-setuptools: 2 | ||
| py-urllib3: 2 |
Comment on lines
+12
to
+15
| epic: 10 | ||
| llvm: 2 | ||
| py-setuptools: 2 | ||
| py-urllib3: 2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Replace ad-hoc duplicate package allowlists passed through container build args with Spack's environment-level duplicate-node configuration.
Changes
concretizer.duplicates.max_dupesto affected environment files:spack-environment/ci/spack.yamlspack-environment/ci_without_acts/spack.yamlspack-environment/cvmfs/spack.yamlspack-environment/tf/spack.yamlspack-environment/xl/epic/spack.yamlspack-environment/cuda/epic/spack.yamlspack-environment/tf/epic/spack.yamlconcretizer.unify: when_possibleoverrides and revert to defaultunify: true.SPACK_DUPLICATE_ALLOWLISTwiring from:containers/eic/Dockerfile.github/workflows/build-push.yml.gitlab-ci.ymlspack-environment/concretizer.yamldocs/spack-environment.mdAGENTS.md.github/copilot-instructions.mdValidation
docker buildx build --target builder_concretization_default --build-context spack-environment=spack-environment --build-arg DOCKER_REGISTRY=ghcr.io/eic/ --build-arg BUILDER_IMAGE=debian_stable_base --build-arg ENV=ci -f containers/eic/Dockerfile .✅docker buildx build --target builder_concretization_default --build-context spack-environment=spack-environment --build-arg DOCKER_REGISTRY=ghcr.io/eic/ --build-arg BUILDER_IMAGE=cuda_devel --build-arg ENV=tf -f containers/eic/Dockerfile .❌ (401 pullingghcr.io/eic/cuda_devel:masterin this environment)