Skip to content

Commit 35d2fa6

Browse files
committed
Merge branch 'stackhpc/2024.1' into cross-arch-builds-2024.1
2 parents 1d3d30a + 83b9fc0 commit 35d2fa6

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

.github/workflows/stackhpc-container-image-build.yml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,7 @@ jobs:
150150
151151
- name: Get Kolla tag
152152
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
160154
- name: Configure localhost as a seed
161155
run: |
162156
cat > src/kayobe-config/etc/kayobe/environments/ci-builder/inventory/hosts << EOF
@@ -189,7 +183,11 @@ jobs:
189183
args="$args -e kolla_base_arch=${{ matrix.arch }}"
190184
fi
191185
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
193191
args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
194192
source venvs/kayobe/bin/activate &&
195193
source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -206,19 +204,12 @@ jobs:
206204
run: sudo cp -rnL /opt/kayobe/etc/kolla/* image-build-logs/
207205
if: inputs.overcloud
208206

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-
216207
- name: Build kolla seed images
217208
id: build_seed_images
218209
continue-on-error: true
219210
run: |
220211
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 }}"
222213
args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
223214
source venvs/kayobe/bin/activate &&
224215
source src/kayobe-config/kayobe-env --environment ci-builder &&

doc/source/operations/upgrading-openstack.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,15 @@ to 3.12, then to 3.13 on Antelope before the Caracal upgrade. This upgrade
187187
should not cause an API outage (though it should still be considered "at
188188
risk").
189189

190+
Some errors have been observed in testing when the upgrades are perfomed
191+
back-to-back. A 200s delay eliminates this issue. On particularly large or slow
192+
deployments, consider increasing this timeout.
193+
190194
.. code-block:: bash
191195
192196
kayobe overcloud service configuration generate --node-config-dir /tmp/ignore -kt none
193197
kayobe kolla ansible run "rabbitmq-upgrade 3.12"
198+
sleep 200
194199
kayobe kolla ansible run "rabbitmq-upgrade 3.13"
195200
196201
RabbitMQ quorum queues

0 commit comments

Comments
 (0)