@@ -150,13 +150,7 @@ jobs:
150
150
151
151
- name : Get Kolla tag
152
152
id : write-kolla-tag
153
- run : |
154
- kolla_tag="${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ needs.generate-tag.outputs.datetime_tag }}"
155
- if [[ "${{ matrix.distro }}" == 'rocky' ]]; then
156
- kolla_tag="$kolla_tag-${{ matrix.arch }}"
157
- fi
158
- echo "kolla-tag=$kolla_tag" >> $GITHUB_OUTPUT
159
-
153
+ run : echo "kolla-tag=${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ matrix.distro == 'rocky' && '9' || 'jammy' }}-${{ needs.generate-tag.outputs.datetime_tag }}" >> $GITHUB_OUTPUT
160
154
- name : Configure localhost as a seed
161
155
run : |
162
156
cat > src/kayobe-config/etc/kayobe/environments/ci-builder/inventory/hosts << EOF
@@ -189,7 +183,11 @@ jobs:
189
183
args="$args -e kolla_base_arch=${{ matrix.arch }}"
190
184
fi
191
185
args="$args -e kolla_base_distro=${{ matrix.distro }}"
192
- args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}"
186
+ if [[ "${{ matrix.distro }}" = 'rocky' ]]; then
187
+ args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}-${{ matrix.arch }}"
188
+ else
189
+ args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}"
190
+ fi
193
191
args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
194
192
source venvs/kayobe/bin/activate &&
195
193
source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -206,19 +204,12 @@ jobs:
206
204
run : sudo cp -rnL /opt/kayobe/etc/kolla/* image-build-logs/
207
205
if : inputs.overcloud
208
206
209
- - name : Get Kolla tag for seed images
210
- id : write-kolla-tag-seed
211
- run : |
212
- kolla_tag_seed="${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ needs.generate-tag.outputs.datetime_tag }}"
213
- echo "kolla-tag-seed=$kolla_tag_seed" >> $GITHUB_OUTPUT
214
- if : inputs.seed
215
-
216
207
- name : Build kolla seed images
217
208
id : build_seed_images
218
209
continue-on-error : true
219
210
run : |
220
211
args="-e kolla_base_distro=${{ matrix.distro }}"
221
- args="$args -e kolla_tag=${{ steps.write-kolla-tag-seed.outputs.kolla-tag-seed }}"
212
+ args="$args -e kolla_tag=${{ steps.write-kolla-tag-seed.outputs.kolla-tag }}"
222
213
args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
223
214
source venvs/kayobe/bin/activate &&
224
215
source src/kayobe-config/kayobe-env --environment ci-builder &&
0 commit comments