Skip to content

Commit e8dbe4e

Browse files
bbezakbbezak
committed
Merge branch 'stackhpc/2024.1' into cross-arch-builds-2024.1
Change-Id: I3c0fc7adebe274920592ab461c3e803c0f78a27c
2 parents b7c0457 + 7950069 commit e8dbe4e

File tree

7 files changed

+30
-36
lines changed

7 files changed

+30
-36
lines changed

‎.github/workflows/package-build-ofed.yml‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ jobs:
2828
runs-on: arc-skc-host-image-builder-runner
2929
permissions: {}
3030
steps:
31+
- name: Generate OFED tag
32+
id: ofed_tag
33+
run: |
34+
echo "ofed_tag=$(date +%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
35+
3136
- name: Install Package
3237
uses: ConorMacBride/install-package@main
3338
with:
@@ -42,32 +47,14 @@ jobs:
4247
with:
4348
path: src/kayobe-config
4449

45-
- name: Determine OpenStack release
46-
id: openstack_release
47-
run: |
48-
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' src/kayobe-config/.gitreview)
49-
echo "openstack_release=${BRANCH}" | sed -E "s,(stable|unmaintained)/,," >> $GITHUB_OUTPUT
50-
51-
- name: Generate OFED tag
52-
id: ofed_tag
53-
run: |
54-
echo "ofed_tag=$(date +%Y%m%dT%H%M%S)" >> $GITHUB_OUTPUT
55-
56-
- name: Clone StackHPC Kayobe repository
57-
uses: actions/checkout@v4
58-
with:
59-
repository: stackhpc/kayobe
60-
ref: refs/heads/stackhpc/${{ steps.openstack_release.outputs.openstack_release }}
61-
path: src/kayobe
62-
6350
- name: Install Kayobe
6451
run: |
6552
mkdir -p venvs &&
6653
pushd venvs &&
6754
python3 -m venv kayobe &&
6855
source kayobe/bin/activate &&
6956
pip install -U pip &&
70-
pip install ../src/kayobe
57+
pip install -r ../src/kayobe-config/requirements.txt
7158
7259
- name: Install terraform
7360
uses: hashicorp/setup-terraform@v2

‎etc/kayobe/kolla-image-tags.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# where the key is the OS distro and the value is the tag to deploy.
55
kolla_image_tags:
66
openstack:
7-
rocky-9: 2024.1-rocky-9-20250711T161715
8-
ubuntu-jammy: 2024.1-ubuntu-jammy-20250711T161715
9-
ubuntu-noble: 2024.1-ubuntu-noble-20250711T161715
7+
rocky-9: 2024.1-rocky-9-20250715T083226
8+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250715T083226
9+
ubuntu-noble: 2024.1-ubuntu-noble-20250715T083226

‎etc/kayobe/ofed.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,22 @@
33

44
###############################################################################
55
# DOCA host version
6-
stackhpc_pulp_doca_version: 2.9.1
6+
stackhpc_pulp_doca_version: "{{ '2.9.3' if stackhpc_pulp_repo_rocky_9_minor_version == '6' else '2.9.1' }}"
77

88
###############################################################################
99
# Pulp configuration for DOCA OFED
1010

1111
# Whether to sync OFED repositories into the local Pulp service
1212
stackhpc_pulp_sync_ofed: "{{ groups['mlnx'] | length > 0 }}"
1313

14+
# DOCA Snapshot lookup vars
15+
doca_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_version"
16+
doca_modules_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_version"
17+
1418
# DOCA Snapshot versions. The defaults use the appropriate version from
1519
# pulp-repo-versions.yml
16-
stackhpc_pulp_repo_rhel9_doca_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel_9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_doca_version') }}"
17-
stackhpc_pulp_repo_rhel9_doca_modules_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel_9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_doca_modules_version') }}"
20+
stackhpc_pulp_repo_rhel9_doca_version: "{{ lookup('vars', doca_version_lookup_var) }}"
21+
stackhpc_pulp_repo_rhel9_doca_modules_version: "{{ lookup('vars', doca_modules_version_lookup_var) }}"
1822

1923
###############################################################################
2024
# Dummy variable to allow Ansible to accept this file.

‎etc/kayobe/pulp-repo-versions.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,9 @@ stackhpc_pulp_repo_ubuntu_jammy_security_version: 20250417T070229
7979
stackhpc_pulp_repo_ubuntu_jammy_version: 20250417T070229
8080
stackhpc_pulp_repo_ubuntu_noble_security_version: 20250417T033501
8181
stackhpc_pulp_repo_ubuntu_noble_version: 20250417T033501
82-
stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
83-
stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245
84-
stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301
85-
stackhpc_pulp_repo_rhel_9_5_doca_modules_version: 20250115T150314
86-
##### NOTE: Dummy variables, currently no RL9.6 DOCA
87-
stackhpc_pulp_repo_rhel_9_6_doca_modules_version: 00000000T000000
88-
stackhpc_pulp_repo_rhel_9_6_doca_version: 00000000T000000
89-
######
82+
stackhpc_pulp_repo_doca_2_9_1_rhel9_4_version: 20241211T153620
83+
stackhpc_pulp_repo_doca_2_9_1_rhel9_4_modules_version: 20241213T112245
84+
stackhpc_pulp_repo_doca_2_9_1_rhel9_5_version: 20241211T171301
85+
stackhpc_pulp_repo_doca_2_9_1_rhel9_5_modules_version: 20250115T150314
86+
stackhpc_pulp_repo_doca_2_9_3_rhel9_6_version: 20250703T135021
87+
stackhpc_pulp_repo_doca_2_9_3_rhel9_6_modules_version: 20250714T141841

‎etc/kayobe/pulp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ stackhpc_pulp_distribution_deb_production: >-
243243
# Whether to sync Rocky Linux 9 packages.
244244
stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
245245
# Rocky 9 minor version number. Supported values: 1, 2, 3, 4, 5, 6. Default is 6
246-
stackhpc_pulp_repo_rocky_9_minor_version: 6
246+
stackhpc_pulp_repo_rocky_9_minor_version: '6'
247247
# Rocky 9 Snapshot versions. The defaults use the appropriate version from
248248
# pulp-repo-versions.yml for the selected minor release.
249249

‎etc/kayobe/stackhpc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
165165

166166
# Kolla source repository.
167167
stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
168-
stackhpc_kolla_source_version: stackhpc/18.6.0.13
168+
stackhpc_kolla_source_version: stackhpc/18.7.0.2
169169

170170
# Kolla Ansible source repository.
171171
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
172-
stackhpc_kolla_ansible_source_version: stackhpc/18.6.0.15
172+
stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.1
173173

174174
###############################################################################
175175
# Container image registry

‎releasenotes/notes/doca-2-9-3-238838fb78e0c7d9.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
features:
3+
- |
4+
Added support for DOCA OFED on Rocky Linux 9.6 at version ``2.9.3``. The
5+
package versions for Rocky 9.4 and 9.5 remain unchanged, using ``2.9.1``.

0 commit comments

Comments
 (0)