Skip to content

Commit 9b67036

Browse files
authored
Merge branch 'stackhpc/2025.1' into upstream/2025.1-2025-09-08
2 parents 1850c71 + 6c14214 commit 9b67036

File tree

5 files changed

+30
-5
lines changed

5 files changed

+30
-5
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @stackhpc/kayobe
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: Tag & Release
3+
'on':
4+
push:
5+
branches:
6+
- stackhpc/2025.1
7+
permissions:
8+
actions: read
9+
contents: write
10+
jobs:
11+
tag-and-release:
12+
uses: stackhpc/.github/.github/workflows/tag-and-release.yml@main

.github/workflows/tox.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
name: Tox Continuous Integration
3+
'on':
4+
pull_request:
5+
jobs:
6+
tox:
7+
uses: stackhpc/.github/.github/workflows/tox.yml@main

playbooks/kayobe-base/pre.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@
8888
kayobe_galaxy_requirements_src_dir: "{{ kolla_ansible_src_dir }}"
8989
kayobe_galaxy_requirements_dest_path: "/tmp/kolla-ansible-requirements.yml"
9090

91+
- vars:
92+
branch_prefix: "{{ 'unmaintained' if previous_release | lower == '2023.1' else 'stable' }}"
93+
9194
# NOTE(wszumski): I explored running as an unprivileged user, but it looked like
9295
# a world of pain, so I've gone for this simpler approach (for now).
9396
- block:
@@ -139,7 +142,7 @@
139142

140143
- name: Ensure previous kayobe repository is cloned
141144
command: >-
142-
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
145+
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}
143146
144147
- name: Ensure previous kayobe-config directory exists
145148
file:
@@ -148,7 +151,7 @@
148151

149152
- name: Ensure kayobe-config repository is cloned
150153
command: >-
151-
git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
154+
git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}
152155
153156
- name: Ensure previous kolla-ansible directory exists
154157
file:
@@ -157,7 +160,7 @@
157160

158161
- name: Ensure previous kolla-ansible repository is cloned
159162
command: >-
160-
git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b stable/{{ previous_release | lower }}
163+
git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}
161164
162165
- name: Ensure previous kayobe is executed in verbose mode
163166
lineinfile:
@@ -180,14 +183,14 @@
180183
name: kayobe-galaxy-requirements
181184
vars:
182185
kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}"
183-
kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
186+
kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}"
184187

185188
- name: Update kolla-ansible requirements.yml
186189
include_role:
187190
name: kayobe-galaxy-requirements
188191
vars:
189192
kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}"
190-
kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
193+
kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}"
191194
kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml"
192195

193196
when: is_upgrade

zuul.d/project.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@
3333
- kayobe-seed-upgrade-ubuntu-noble
3434
- kayobe-seed-upgrade-slurp-rocky9
3535
- kayobe-seed-vm-rocky9
36+
- kayobe-seed-vm-rocky9-efi
3637
- kayobe-seed-vm-ubuntu-noble
38+
- kayobe-seed-vm-ubuntu-noble-efi
3739
- kayobe-infra-vm-rocky9
3840
- kayobe-infra-vm-ubuntu-noble
3941
gate:

0 commit comments

Comments
 (0)