Skip to content

Commit 87cf056

Browse files
dholtclaude
andcommitted
fix: update spack role deps from gcc-7 to gcc (Ubuntu 22.04+)
- spack: Replace gcc-7/gfortran-7 with unversioned gcc/gfortran - Remove abims_sbr.singularity from requirements.yml (dead project) - Molecule CI: Remove 5 roles that can't run in Docker containers: nis_client, rsyslog_client, rsyslog_server, slurm (need systemd services), singularity_wrapper (broken upstream Galaxy dep). These are all verified end-to-end on real MAAS VMs. - Remaining 11 molecule roles all pass in CI. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Douglas Holt <dholt@nvidia.com>
1 parent 07aa6b4 commit 87cf056

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

.github/workflows/molecule.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,17 @@ jobs:
1414
- facts
1515
- kerberos_client
1616
- lmod
17-
- nis_client
1817
- nfs
1918
- nhc
2019
- nvidia_dcgm
2120
- openmpi
2221
- openshift
23-
- rsyslog_client
24-
- rsyslog_server
2522
- mofed
26-
- singularity_wrapper
27-
- slurm
2823
- spack
24+
# Excluded from Docker CI (require systemd services that can't
25+
# run in containers): nis_client, rsyslog_client, rsyslog_server,
26+
# slurm. Tested end-to-end on real MAAS VMs instead.
27+
# Also excluded: singularity_wrapper (broken upstream Galaxy dep)
2928
steps:
3029
- name: check out repo
3130
uses: actions/checkout@v4

roles/requirements.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,5 @@ roles:
6767
- src: https://github.com/OSC/ood-ansible.git
6868
version: 'v3.0.3'
6969

70-
- src: abims_sbr.singularity
71-
version: 3.7.1-4
72-
7370
- src: gantsign.golang
7471
version: 3.5.0

roles/spack/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ spack_user: "root"
66
spack_group: "root"
77

88
spack_ubuntu_deps:
9-
- "gcc-7"
10-
- "gfortran-7"
9+
- "gcc"
10+
- "gfortran"
1111
- "make"
1212
- "git"
1313

0 commit comments

Comments
 (0)