Skip to content

Commit f8e7578

Browse files
committed
Merge branch 'main' @ v2.2 into feat/isolated-env-2
2 parents de48073 + 4627526 commit f8e7578

File tree

6 files changed

+10
-3
lines changed

6 files changed

+10
-3
lines changed

.github/workflows/extra.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
99
- 'ansible/roles/doca/**'
1010
- 'ansible/roles/cuda/**'
11+
- 'ansible/roles/slurm_recompile/**' # runs on cuda group
1112
- 'ansible/roles/lustre/**'
1213
- '.github/workflows/extra.yml'
1314
pull_request:

ansible/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ roles/*
9090
!roles/gateway/**
9191
!roles/alertmanager/
9292
!roles/alertmanager/**
93-
!roles/slurm_recompile/**
93+
!roles/slurm_recompile/
9494
!roles/slurm_recompile/**
9595
!roles/nhc/
9696
!roles/nhc/**
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
doca_version: '2.9.1' # 2.9 is LTS, last to support ConnectX-4, 3 years for bug fixes and CVE updates
1+
doca_version: '2.9.2' # 2.9 is LTS, last to support ConnectX-4, 3 years for bug fixes and CVE updates
22
doca_profile: doca-ofed
33
doca_repo_url: "https://linux.mellanox.com/public/repo/doca/{{ doca_version }}/rhel{{ ansible_distribution_version }}/{{ ansible_architecture }}/"

ansible/roles/ofed/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ofed_version: '23.10-3.2.2.0' # LTS
1+
ofed_version: '24.10-2.1.8.0' # LTS
22
ofed_download_url: https://content.mellanox.com/ofed/MLNX_OFED-{{ ofed_version }}/MLNX_OFED_LINUX-{{ ofed_version }}-{{ ofed_distro }}{{ ofed_distro_version }}-{{ ofed_arch }}.tgz
33
ofed_distro: rhel # NB: not expected to work on other distros due to installation differences
44
ofed_distro_version: "{{ ansible_distribution_version }}" # e.g. '8.9'

ansible/roles/slurm_recompile/defaults/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
# Whether to link slurm against the NVIDIA management library
33
slurm_recompile_with_nvml: false
44

5+
slurm_recompile_build_packages:
6+
- rpm-build

ansible/roles/slurm_recompile/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
set_fact:
1313
slurm_package: "{{ ansible_facts.packages['slurm-slurmd-ohpc'].0 }}"
1414

15+
- name: Install build packages
16+
ansible.builtin.dnf:
17+
name: "{{ slurm_recompile_build_packages }}"
18+
1519
- name: Recompile and install slurm packages
1620
shell: |
1721
#!/bin/bash

0 commit comments

Comments
 (0)