Skip to content

Commit a6f4c96

Browse files
authored
Merge branch 'stackhpc/master' into upstream/master-2026-04-01
2 parents 8b8ac1c + b0148ec commit a6f4c96

File tree

4 files changed

+25
-5
lines changed

4 files changed

+25
-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/master
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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139

140140
- name: Ensure previous kayobe repository is cloned
141141
command: >-
142-
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
142+
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}
143143
144144
- name: Ensure previous kayobe-config directory exists
145145
file:
@@ -148,7 +148,7 @@
148148

149149
- name: Ensure kayobe-config repository is cloned
150150
command: >-
151-
git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
151+
git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}
152152
153153
- name: Ensure previous kolla-ansible directory exists
154154
file:
@@ -157,7 +157,7 @@
157157

158158
- name: Ensure previous kolla-ansible repository is cloned
159159
command: >-
160-
git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b stable/{{ previous_release | lower }}
160+
git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}
161161
162162
- name: Ensure previous kayobe is executed in verbose mode
163163
lineinfile:
@@ -180,14 +180,14 @@
180180
name: kayobe-galaxy-requirements
181181
vars:
182182
kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}"
183-
kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
183+
kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}"
184184

185185
- name: Update kolla-ansible requirements.yml
186186
include_role:
187187
name: kayobe-galaxy-requirements
188188
vars:
189189
kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}"
190-
kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
190+
kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}"
191191
kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml"
192192

193193
when: is_upgrade

0 commit comments

Comments
 (0)