Skip to content

Infra Update v4: Support spack.repos and spack.include - #74

Draft
CodeGat wants to merge 15 commits into
2026.05from
infra-v4
Draft

CodeGat wants to merge 15 commits into
2026.05from
infra-v4

Conversation

@CodeGat

@CodeGat CodeGat commented Aug 26, 2026

Copy link
Copy Markdown
Member

Closes #73

Note

This PR is currently being used for testing, and will be reformatted once testing completes

Background

More info and motivations in the linked issue, but essentially:

  • Deprecating inputs.*-spack-packages-ref in favor of in-manfiest spack.repos section, like MDRs.
  • Deprecating inputs.spack-manifest-data-path in favor of tiered configuration via spack.inclue.

The PR

  • Update the workflow entrypoints, as usual!
  • Remove any inputs.*-spack-packages-refs and transplant them into manifests spack.repos sections
  • Remove any inputs.spack-manifest-data-path and replace that with spack.include entries, either from Add top-level spack.includes default access-spack-packages#484 or a CR-level manifest to include.

Testing

See below!

@CodeGat CodeGat self-assigned this Aug 26, 2026
@CodeGat
CodeGat force-pushed the infra-v4 branch 4 times, most recently from acfc5ab to b5509e5 Compare August 26, 2026 01:46
Comment thread .github/build-ci/manifests/oneapi_access-om3_asymm.spack.yaml.j2 Outdated
@CodeGat

CodeGat commented Sep 2, 2026

Copy link
Copy Markdown
Member Author

Validated that this structure works with ACCESS-NRI/build-ci@43c75ab and ACCESS-NRI/access-spack-packages@81e6045

For PRs from component repositories

See https://github.com/ACCESS-NRI/MOM6/actions/runs/33574388321 (explicitly not including the ASP-specific CI in https://github.com/ACCESS-NRI/MOM6/actions/runs/33574388321/job/100075540562#step:20:1094

For PRs from ASP

I tested this manually by setting the appropriate environment variables in a docker container, simulating (some of) the build-ci workflow:

$ docker run -it --rm ghcr.io/access-nri/build-ci-upstream:rocky
$ mkdir opt/repos
$ git clone https://github.com/access-nri/mom6.git opt/repos/MOM6 --branch infra-v4  # this is our CR
$ git clone https://github.com/access-nri/access-spack-packages.git opt/repos/access-spack-packages --branch 484-top-level-includes  # this is our caller, ASP
$ export USE_CALLER_REPOSITORY_PATH=1  # Set as a repo-level var in github
$ export SPACK_MANIFEST_REPOSITORY_PATH=/opt/repos/MOM6  # set in build-ci
$ export CALLER_REPOSITORY_PATH=/opt/repos/access-spack-packages/  # set in build-ci
$ export CALLER_REPOSITORY_PATH_CONFIG=/opt/repos/access-spack-packages/.github/build-ci/include/ASP-ci  # set in build-ci, as well
I then removed the jinja templating from opt/repos/MOM6/.github/build-ci/manifests/oneapi_mom6_solo.spack.yaml.j2 
$ spack -d env create default opt/repos/MOM6/.github/build-ci/manifests/oneapi_mom6_solo.spack.yaml.j2
==> Warning: Skipping copy of non-existent include path: '$SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/include'
remote: Enumerating objects: 20373, done.
remote: Counting objects: 100% (20373/20373), done.
remote: Compressing objects: 100% (10991/10991), done.
remote: Total 20373 (delta 1335), reused 14167 (delta 1165), pack-reused 0 (from 0)
==> Created environment default in: /opt/environments/default
==> Activate with: spack env activate default

@CodeGat
CodeGat force-pushed the infra-v4 branch 3 times, most recently from 7f75fcc to afed869 Compare September 9, 2026 05:16
@CodeGat

CodeGat commented Sep 9, 2026

Copy link
Copy Markdown
Member Author

This now works with the updated structure in ACCESS-NRI/access-spack-packages#486

@CodeGat
CodeGat force-pushed the infra-v4 branch 2 times, most recently from 76d38f4 to 2699a76 Compare September 14, 2026 00:31
@CodeGat

CodeGat commented Sep 14, 2026

Copy link
Copy Markdown
Member Author

Just wanted to note @aidanheerdegen that we can't remove the branch reference from https://github.com/ACCESS-NRI/MOM6/pull/74/changes#diff-1e8e993b87e4f9cc9d1c3b5f43394649ea4c77fa63587f76059267e561111d18R4 as it's a required bit of information - no default branch magic unfortunately!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Infra Update v4: Support spack.repos, Add Tiered Common Configuration Via spack.include

2 participants