Skip to content

Commit 3be4447

Browse files
Alex-WelshAlex-Welsh
committed
Merge remote-tracking branch 'origin/stackhpc/2025.1' into sync-2025.1
2 parents ee9b5e7 + b80fbec commit 3be4447

14 files changed

Lines changed: 139 additions & 121 deletions

File tree

‎.coderabbit.yaml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
2+
# CodeRabbit review config file
3+
4+
language: "en-GB"
5+
reviews:
6+
# Options are "quiet", "chill", "assertive" in order of nitpickyness
7+
profile: "assertive"
8+
# Don't automatically approves PRs
9+
request_changes_workflow: false
10+
# Summarise the PR in a comment
11+
high_level_summary: true
12+
# Summary instructions
13+
high_level_summary_instructions: "Give a brief description of the changes in 50 words or less."
14+
# Put summary in a comment, don't override the PR description
15+
high_level_summary_in_walkthrough: true
16+
# Post a comment e.g. when a review is skipped, why so
17+
review_status: true
18+
# Posts extra details about the review (ignored files, extra context used, suppressed comments, etc.)
19+
review_details: true
20+
# Don't suggest labels to apply to PRs
21+
suggested_labels: false
22+
# Don't suggest reviewers to add to the PR
23+
suggested_reviewers: false
24+
# Don't post a "fortune" message while the review is running
25+
in_progress_fortune: false
26+
# Don't include review comments to provide codegen instructions for AI agents.
27+
enable_prompt_for_ai_agents: false
28+
29+
# Auto review configuration
30+
auto_review:
31+
# Review things
32+
enabled: true
33+
# Review draft PRs
34+
drafts: true
35+
# Don't auto re-review on push (Can always be re-triggered manually)
36+
auto_incremental_review: false
37+
# Branches to auto-review PRs against
38+
# Regex should match branch such as:
39+
# stackhpc/2025.1
40+
# stackhpc-dev/2026.1
41+
# stackhpc-rc/2027.1
42+
base_branches:
43+
- ^stackhpc/202\d\.1$
44+
- ^stackhpc-rc/202\d\.1$
45+
- ^stackhpc-dev/202\d\.1$
46+
# Ignore PRs by the CI bot
47+
ignore_usernames:
48+
- "stackhpc-ci"
49+
50+
finishing_touches:
51+
# Don't try to add docstrings and unit tests
52+
docstrings:
53+
enabled: false
54+
unit_tests:
55+
enabled: false
56+
57+
pre_merge_checks:
58+
# Ignore title/description checks
59+
title:
60+
mode: "off"
61+
description:
62+
mode: "off"
63+
64+
# Additional context options
65+
knowledge_base:
66+
# Auto link to other repos in the org
67+
automatic_repository_linking: true

‎.github/auto-label.yaml‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎.github/workflows/stackhpc-all-in-one.yml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -278,28 +278,6 @@ jobs:
278278
run: |
279279
docker image pull $KAYOBE_IMAGE
280280
281-
# Rocky 9 OVN deployments will fail when the hostname contains a '.'
282-
- name: Fix hostname
283-
run: |
284-
docker run -t --rm \
285-
-v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
286-
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
287-
${{ steps.kayobe_image.outputs.kayobe_image }} \
288-
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible${{ inputs.upgrade && '/' || '/fixes/' }}fix-hostname.yml
289-
env:
290-
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
291-
292-
# Reboot to Apply hostname change
293-
- name: Reboot
294-
run: |
295-
docker run -t --rm \
296-
-v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
297-
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
298-
${{ steps.kayobe_image.outputs.kayobe_image }} \
299-
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible${{ inputs.upgrade && '/' || '/maintenance/' }}reboot.yml -e reboot_with_bootstrap_user=true
300-
env:
301-
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
302-
303281
- name: Run growroot
304282
run: |
305283
docker run -t --rm \

‎etc/kayobe/ansible/maintenance/reset-bls-entries.yml‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,33 @@
1010
tags:
1111
- reset-bls-entries
1212
tasks:
13-
- name: Get machine ID
14-
ansible.builtin.command: cat /etc/machine-id
15-
register: machine_id
16-
check_mode: false
13+
- name: Reset BLS entries on RedHat-based systems
14+
when: ansible_facts.os_family == 'RedHat'
15+
block:
16+
- name: Get machine ID
17+
ansible.builtin.command: cat /etc/machine-id
18+
register: machine_id
19+
check_mode: false
1720

18-
- name: Find entries with wrong machine ID
19-
ansible.builtin.find:
20-
paths: /boot/loader/entries
21-
patterns: "*.conf"
22-
register: bls_entries
23-
check_mode: false
21+
- name: Find entries with wrong machine ID
22+
ansible.builtin.find:
23+
paths: /boot/loader/entries
24+
patterns: "*.conf"
25+
register: bls_entries
26+
check_mode: false
2427

25-
# We set force to false to avoid replacing an existing BLS entry with the
26-
# correct machine ID.
27-
- name: Rename entries with wrong machine ID
28-
ansible.builtin.copy:
29-
src: /boot/loader/entries/{{ item }}
30-
dest: /boot/loader/entries/{{ item | ansible.builtin.regex_replace('^[a-f0-9]*', machine_id.stdout) }}
31-
force: false
32-
remote_src: true
33-
with_items: "{{ bls_entries.files | map(attribute='path') | reject('search', machine_id.stdout) | map('basename') }}"
28+
# We set force to false to avoid replacing an existing BLS entry with the
29+
# correct machine ID.
30+
- name: Rename entries with wrong machine ID
31+
ansible.builtin.copy:
32+
src: /boot/loader/entries/{{ item }}
33+
dest: /boot/loader/entries/{{ item | ansible.builtin.regex_replace('^[a-f0-9]*', machine_id.stdout) }}
34+
force: false
35+
remote_src: true
36+
with_items: "{{ bls_entries.files | map(attribute='path') | reject('search', machine_id.stdout) | map('basename') }}"
3437

35-
- name: Remove entries with wrong machine ID
36-
ansible.builtin.file:
37-
path: /boot/loader/entries/{{ item }}
38-
state: absent
39-
with_items: "{{ bls_entries.files | map(attribute='path') | reject('search', machine_id.stdout) | map('basename') }}"
38+
- name: Remove entries with wrong machine ID
39+
ansible.builtin.file:
40+
path: /boot/loader/entries/{{ item }}
41+
state: absent
42+
with_items: "{{ bls_entries.files | map(attribute='path') | reject('search', machine_id.stdout) | map('basename') }}"

‎etc/kayobe/hooks/overcloud-host-package-update/post.d/20-reset-bls-entries‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../ansible/maintenance/reset-bls-entries.yml

‎etc/kayobe/hooks/overcloud-host-package-update/post.d/releasenotes/notes/reset-bls-entries-20375af82dfd3517.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Adds a hook to automatically fix BLS configuration files under
5+
``/boot/loader/entries`` after overcloud host package update.

‎etc/kayobe/ipa.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@
2222
#ipa_build_source_version:
2323

2424
# URL of IPA builder source repository.
25-
#ipa_builder_source_url:
25+
# NOTE(dougszu): This fork is required for centos-10 stream IPA images, which
26+
# are required (currently) to provide a version of qemu-img that can handle
27+
# 4k sectors from Dell Perc RAID controllers which don't support other block
28+
# sizes.
29+
ipa_builder_source_url: https://github.com/stackhpc/ironic-python-agent-builder.git
2630

2731
# Version of IPA builder source repository. Default is {{ openstack_branch }}.
28-
#ipa_builder_source_version:
32+
ipa_builder_source_version: stackhpc/2025.1
2933

3034
# List of additional build host packages to install. Default is [ 'zstd' ].
3135
#ipa_build_dib_host_packages_extra:

‎etc/kayobe/kolla/globals.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ kolla_base_distro_and_version: "{% raw %}{{ kolla_base_distro }}-{{ kolla_base_d
1717
kolla_base_distro_version_default_map: {
1818
"centos": "stream9",
1919
"debian": "bookworm",
20-
"rocky": "{{ os_release }}",
20+
"rocky": "{% raw %}{{ ansible_facts.distribution_major_version }}{% endraw %}",
2121
"ubuntu": "noble",
2222
}
2323

‎etc/kayobe/ofed.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ stackhpc_pulp_rocky_10_doca_version: "{{ stackhpc_pulp_doca_version_matrix[doca_
1919
stackhpc_doca_kernel_version_matrix:
2020
"9.6": 5.14.0.570.21.1.el9.6
2121
"9.7": 5.14.0.611.55.1.el9.7
22-
"9.8": 5.14.0.687.25.1.el9.8
22+
"9.8": 5.14.0.687.26.1.el9.8
2323
"10.2": 6.12.0.211.33.1.el10.2
2424

2525
###############################################################################

‎etc/kayobe/pulp-host-image-versions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
# Overcloud host image versioning tags
33
# These images must be in SMS, since they are used by our AIO CI runners
4-
stackhpc_rocky_9_overcloud_host_image_version: 2025.1-20260715T072311
5-
stackhpc_rocky_9_overcloud_host_image_version_aarch64: 2025.1-20260715T072311
4+
stackhpc_rocky_9_overcloud_host_image_version: 2025.1-20260720T114136
5+
stackhpc_rocky_9_overcloud_host_image_version_aarch64: 2025.1-20260720T114136
66
stackhpc_rocky_10_overcloud_host_image_version: 2025.1-20260715T072311
77
stackhpc_rocky_10_overcloud_host_image_version_aarch64: 2025.1-20260715T072311
88
stackhpc_ubuntu_noble_overcloud_host_image_version: 2025.1-20260706T191822

0 commit comments

Comments
 (0)