Skip to content

Fix and QA May 10 2026 develop branch#2

Merged
harshula merged 3 commits into
access/v1.1from
access/v1.1-test
May 19, 2026
Merged

Fix and QA May 10 2026 develop branch#2
harshula merged 3 commits into
access/v1.1from
access/v1.1-test

Conversation

@harshula
Copy link
Copy Markdown
Collaborator

@harshula harshula commented May 18, 2026

At the moment we have a two step process to update the the spack-packages version used by ACCESS-NRI's Spack instances.

  1. Update this repository's access/v1.1 branch.
  2. Update the commit hash used for the builtin in https://github.com/ACCESS-NRI/spack-config/blob/main/v1.1/repos.yaml

@harshula
Copy link
Copy Markdown
Collaborator Author

Testing

ALL
2c8634c9e96c10ea53a2ce7690ab9acbf21c2cb4
api-v2
main
access/releases/v1.1
 Inputs
    spack-manifest-repository: ACCESS-NRI/access-spack-packages
    spack-manifest-repository-ref: 
    spack-manifest-path: .github/build-ci/manifests/cice4/intel.spack.yaml.j2
    spack-manifest-data-path: .github/build-ci/data/standard_definitions.json
    spack-manifest-data-pairs: package cice4
    spack-compiler-manifest-path: 
    ref: 15bbb61707e41430facbb0b1d305a6b9c4cb7c4c
    spack-config-ref: main
    builtin-spack-packages-ref: 2c8634c9e96c10ea53a2ce7690ab9acbf21c2cb4
    access-spack-packages-ref: api-v2
    spack-ref: access/releases/v1.1
    pytest-test-markers: 
    allow-ssh-into-spack-install: false
    container-image-version: :rocky
    spack-oci-buildcache-url: 
    run-self-hosted: true
    packages-to-test: ALL

@harshula
Copy link
Copy Markdown
Collaborator Author

Just reverting a878a3a was insufficient:

$ git log -2 access/v1.1-test2
commit 240939b9b2719c1910db05fb5973df0c7a9c7afa (HEAD -> access/v1.1-test2, origin/access/v1.1-test2)
Author: Harshula Jayasuriya <harshula.jayasuriya@anu.edu.au>
Date:   Mon May 11 12:36:45 2026 +1000

    Reapply "gcc: use link type dep for binutils"
    
    This reverts commit a878a3a62910db7d716790269874e04980fd5b91.

commit 59e541a3024109b1aeef23f60d5358e36a52ad89 (origin/develop, origin/access/v1.1, origin/HEAD, develop, access/v1.1)
Author: Seth R. Johnson <johnsonsr@ornl.gov>
Date:   Sun May 10 20:11:55 2026 -0400

    libxml2: add external find (#4562)

$ git show test2
commit 3a018fb8b6771fb3bd3efb66dc0f0063723442c9 (HEAD -> test2, origin/test2)
Author: Harshula Jayasuriya <harshula.jayasuriya@anu.edu.au>
Date:   Tue May 12 11:36:39 2026 +1000

    v1.1/repos.yaml: access/v1.1-test2

diff --git a/v1.1/repos.yaml b/v1.1/repos.yaml
index d690a9d..39723e2 100644
--- a/v1.1/repos.yaml
+++ b/v1.1/repos.yaml
@@ -6,5 +6,5 @@ repos:
     destination: $spack/../access-spack-packages
   builtin::
     git: https://github.com/ACCESS-NRI/upstream-spack-packages.git
-    branch: access/v1.1-test
+    branch: access/v1.1-test2
     destination: $spack/../spack-packages



$ docker build -f Dockerfile -t spack-dev-rocky:v1.1.1-20260512 --build-arg SPACK_CONFIG_REPO_VERSION=test2 --target dev --no-cache --progress=plain .


#9 1818.8 ==> Installing intel-oneapi-compilers-2025.2.0-xf2j4pkvjfy7jy6zmlticbw2kur3o72f [2/2]
#9 1819.6 Spack v1.x detects compilers directly
#9 1819.6 spack-config v1.x manages access-spack-packages directly
#9 1819.6 Cloning into '/opt/ACCESS-OM2'...
#9 1847.9 ==> Error: failed to concretize `access-om2` for the following reasons:
#9 1847.9      1. Cannot satisfy 'intel-oneapi-runtime@=2023.2.4' 1(2025.2.0)
#9 1847.9      2. Cannot satisfy 'intel-oneapi-runtime@=2023.2.4' 4(2025.2.0)
#9 1847.9         required because intel-oneapi-runtime %[deptypes=build] oneapi/ejqzfefpawwr53i5qfqtaywf6oudm5hw requires intel-oneapi-runtime@=2023.2.4 %gcc-runtime@8.5.0 at runtime 
#9 1847.9           required because intel-oneapi-compilers@2025.2.0 is a requirement for package c 
#9 1847.9             required because intel-oneapi-compilers@2025.2.0 is a requirement for package cxx 
#9 1847.9               required because intel-oneapi-compilers@2025.2.0 is a requirement for package fortran 
#9 1847.9             required because intel-oneapi-compilers@2025.2.0 is a requirement for package fortran 
#9 1847.9           required because intel-oneapi-compilers@2025.2.0 is a requirement for package cxx 
#9 1847.9           required because intel-oneapi-compilers@2025.2.0 is a requirement for package fortran 
#9 1866.1 ==> Error: failed to concretize `access-om2` for the following reasons:
#9 1866.1      1. Cannot satisfy 'intel-oneapi-runtime@=2023.2.4' 1(2025.2.0)
#9 1866.1      2. Cannot satisfy 'intel-oneapi-runtime@=2023.2.4' 4(2025.2.0)
#9 1866.1         required because intel-oneapi-runtime %[deptypes=build] oneapi/ejqzfefpawwr53i5qfqtaywf6oudm5hw requires intel-oneapi-runtime@=2023.2.4 %gcc-runtime@8.5.0 at runtime 
#9 1866.1           required because intel-oneapi-compilers@2025.2.0 is a requirement for package c 
#9 1866.1             required because intel-oneapi-compilers@2025.2.0 is a requirement for package cxx 
#9 1866.1               required because intel-oneapi-compilers@2025.2.0 is a requirement for package fortran 
#9 1866.1             required because intel-oneapi-compilers@2025.2.0 is a requirement for package fortran 
#9 1866.1           required because intel-oneapi-compilers@2025.2.0 is a requirement for package cxx 
#9 1866.1           required because intel-oneapi-compilers@2025.2.0 is a requirement for package fortran 
#9 1867.7 ==> Removing all temporary build stages
#9 1867.7 ==> Removing cached downloads
#9 DONE 1867.8s

#10 exporting to image
#10 exporting layers
#10 exporting layers 15.2s done
#10 writing image sha256:984496a95ed68d3d742e082b02e249cc333702d646d56b48535e36d453d0fb98 done
#10 naming to docker.io/library/spack-dev-rocky:v1.1.1-20260512 done
#10 DONE 15.2s

Copy link
Copy Markdown
Member

@aidanheerdegen aidanheerdegen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks @harshula

@harshula harshula marked this pull request as ready for review May 19, 2026 04:47
@harshula harshula merged commit 6d14ede into access/v1.1 May 19, 2026
@github-project-automation github-project-automation Bot moved this from New Issues 🌅 to Done ✅ in Model Release May 19, 2026
@harshula
Copy link
Copy Markdown
Collaborator Author

Tag 2026.05.19 contains the following three non-upstream commits:

commit 6d14edea6dd551f907fb2f1f0e939016dd2b26b7 (HEAD -> access/v1.1, tag: 2026.05.19, origin/access/v1.1)
Author: Harshula Jayasuriya <harshula.jayasuriya@anu.edu.au>
Date:   Wed May 13 20:20:19 2026 +1000

    fckit: fix error: no member named 'lookup' in 'eckit::system::Library'
    
    * Fixed in 0.14.2: https://github.com/ecmwf/fckit/pull/84

commit 2a72caf1218ed648d05daf976e3e858ff7269c91
Author: Harshula Jayasuriya <harshula.jayasuriya@anu.edu.au>
Date:   Mon May 11 12:36:45 2026 +1000

    Reapply "gcc: use link type dep for binutils"
    
    This reverts commit a878a3a62910db7d716790269874e04980fd5b91.

commit b40d4e43e0ad068f205216d1cc5ea6ba2e03b3a2
Author: Harshula Jayasuriya <harshula.jayasuriya@anu.edu.au>
Date:   Mon May 11 12:36:09 2026 +1000

    Revert "intel-oneapi: constrain gcc-runtime to gcc version"
    
    This reverts commit e40da0e4caa82ce61118ff2f5482993915b818b3.

@harshula harshula changed the title Access/v1.1 test Fix and QA May 10 2026 develop branch May 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done ✅

Development

Successfully merging this pull request may close these issues.

2 participants