Skip to content

Commit df4a45b

Browse files
committed
Automatic openstack release for kolla sources
The NOTE(upgrade) tag has been added to more places to make it easier to update the config for new releases
1 parent 457e27e commit df4a45b

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

.github/workflows/stackhpc-promote.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Promote package repositories
33
on:
44
push:
55
branches:
6-
# NOTE(mgoddard): Reference only the current release branch here.
6+
# NOTE(upgrade): Reference only the current release branch here.
77
- stackhpc/zed
88
jobs:
99
promote:

etc/kayobe/kolla.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,9 @@ kolla_tag: "{{ openstack_release }}-{{ kolla_base_distro }}-{{ kolla_base_distro
111111
# type: git
112112
# location: https://github.com/openstack/ironic
113113
# reference: master
114-
# NOTE (Alex-Welsh): The reference for many of these entries could be
115-
# 'stackhpc/{{ openstack_release }}' which would keep the branch up to date
116-
# for the current release. This is nice in theory but in practice, the stackhpc
117-
# forks change with every release and the elements in this list change with
118-
# them. Explicitly using /zed makes it more intuitive to find and edit these
119-
# entries.
114+
# NOTE(upgrade): These sources should be checked with each release. StackHPC
115+
# branches are only required when we have custom backports. For a new release,
116+
# we may have caught up with upstream.
120117
kolla_sources:
121118
bifrost-base-additions-stackhpc-inspector-plugins:
122119
# Install our custom inspector plugins.
@@ -126,11 +123,11 @@ kolla_sources:
126123
cloudkitty-base:
127124
type: git
128125
location: https://github.com/stackhpc/cloudkitty.git
129-
reference: stackhpc/zed
126+
reference: stackhpc/{{ openstack_release }}
130127
horizon-plugin-cloudkitty-dashboard:
131128
type: git
132129
location: https://github.com/stackhpc/cloudkitty-dashboard.git
133-
reference: stackhpc/zed
130+
reference: stackhpc/{{ openstack_release }}
134131
ironic-inspector-additions-stackhpc-inspector-plugins:
135132
# Install our custom inspector plugins.
136133
type: git
@@ -139,15 +136,15 @@ kolla_sources:
139136
magnum-base:
140137
type: git
141138
location: https://github.com/stackhpc/magnum.git
142-
reference: stackhpc/zed
139+
reference: stackhpc/{{ openstack_release }}
143140
neutron-base:
144141
type: git
145142
location: https://github.com/stackhpc/neutron.git
146143
reference: stackhpc/{{ openstack_release }}
147144
neutron-base-plugin-networking-generic-switch:
148145
type: git
149146
location: https://github.com/stackhpc/networking-generic-switch.git
150-
reference: stackhpc/zed
147+
reference: stackhpc/{{ openstack_release }}
151148

152149
###############################################################################
153150
# Kolla image build configuration.

0 commit comments

Comments
 (0)