Skip to content

Commit b90b743

Browse files
WIP: Use Overcloud deployment image build
1 parent d325c9a commit b90b743

File tree

4 files changed

+36
-11
lines changed

4 files changed

+36
-11
lines changed

.github/workflows/ipa-image-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jobs:
174174
run: |
175175
source venvs/kayobe/bin/activate &&
176176
source src/kayobe-config/kayobe-env --environment ci-builder &&
177-
kayobe seed host configure -e seed_bootstrap_user=ubuntu --skip-tags network
177+
kayobe seed host configure -e seed_bootstrap_user=ubuntu --skip-tags network,apt,docker
178178
179179
- name: Install dependencies
180180
run: |

.github/workflows/package-build-ofed.yml

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jobs:
174174
run: |
175175
source venvs/kayobe/bin/activate &&
176176
source src/kayobe-config/kayobe-env --environment ci-builder &&
177-
kayobe seed host configure -e seed_bootstrap_user=ubuntu
177+
kayobe seed host configure -e seed_bootstrap_user=ubuntu --skip-tags network,apt,docker,docker-registry
178178
179179
- name: Install dependencies
180180
run: |
@@ -185,12 +185,6 @@ jobs:
185185
env:
186186
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
187187

188-
- name: Deploy Bifrost (Builder VM)
189-
run: |
190-
source venvs/kayobe/bin/activate &&
191-
source src/kayobe-config/kayobe-env --environment ci-builder &&
192-
kayobe seed service deploy --kolla-tags bifrost --tags bifrost -ke include_dhcp_server=false
193-
194188
- name: Create bifrost_httpboot Docker volume
195189
run: |
196190
source venvs/kayobe/bin/activate &&
@@ -205,17 +199,29 @@ jobs:
205199
run: |
206200
source venvs/kayobe/bin/activate &&
207201
source src/kayobe-config/kayobe-env --environment ci-builder &&
208-
kayobe seed deployment image build --force-rebuild
202+
kayobe overcloud deployment image build --force-rebuild \
203+
-e os_distribution="ubuntu" \
204+
-e os_release="jammy" \
205+
env:
206+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
207+
208+
- name: Show last error logs
209+
continue-on-error: true
210+
run: |
211+
source venvs/kayobe/bin/activate &&
212+
source src/kayobe-config/kayobe-env --environment ci-builder &&
213+
kayobe seed host command run --command "tail -200 /opt/kayobe/images/ipa/ipa.stdout" --show-output
209214
env:
210215
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
216+
if: steps.build_ipa.outcome == 'failure'
211217

212218
- name: Upload IPA kernel image to Ark
213219
run: |
214220
source venvs/kayobe/bin/activate &&
215221
source src/kayobe-config/kayobe-env --environment ci-builder &&
216222
kayobe playbook run \
217223
src/kayobe-config/etc/kayobe/ansible/pulp-image-upload.yml \
218-
-e image_path=/etc/kolla/ipa.kernel \
224+
-e image_path=/opt/kayobe/images/ipa.kernel \
219225
-e repository_name="ipa-{{ openstack_release }}" \
220226
-e pulp_base_path="ipa/{{ openstack_release }}" \
221227
-e image_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \
@@ -230,7 +236,7 @@ jobs:
230236
source src/kayobe-config/kayobe-env --environment ci-builder &&
231237
kayobe playbook run \
232238
src/kayobe-config/etc/kayobe/ansible/pulp-image-upload.yml \
233-
-e image_path=/etc/kolla/ipa.initramfs \
239+
-e image_path=/opt/kayobe/images/ipa.initramfs \
234240
-e repository_name="ipa-{{ openstack_release }}" \
235241
-e pulp_base_path="ipa/{{ openstack_release }}" \
236242
-e image_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \
@@ -239,6 +245,19 @@ jobs:
239245
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
240246
if: steps.build_ipa.outcome == 'success'
241247

248+
- name: Copy logs back
249+
continue-on-error: true
250+
run: |
251+
mkdir logs
252+
scp -r ubuntu@$(jq -r .access_ip_v4.value src/kayobe-config/etc/kayobe/environments/ci-builder/tf-outputs.yml):/opt/kayobe/images/*/*.std* ./logs/
253+
if: always()
254+
255+
- name: Upload logs artifact
256+
uses: actions/upload-artifact@v4
257+
with:
258+
name: Build logs
259+
path: ./logs
260+
242261
- name: Fail if the IPA image build failed
243262
run: |
244263
echo "Builds failed. See workflow artifacts for details." &&

etc/kayobe/environments/ci-builder/inventory/hosts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
[ofed-builder:children]
44
seed
55

6+
[controllers]
7+
builder
8+
69
[seed]
710
builder

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,6 @@ stackhpc_docker_registry_password: !vault |
9696
# Username and password of the overcloud host image repository.
9797
stackhpc_image_repository_username: "{{ stackhpc_docker_registry_username }}"
9898
stackhpc_image_repository_password: "{{ stackhpc_docker_registry_password }}"
99+
100+
# Build during IPA builder workflow
101+
ipa_build_images: true

0 commit comments

Comments
 (0)