@@ -84,21 +84,33 @@ jobs:
84
84
EOF
85
85
working-directory : ${{ github.workspace }}/src/kayobe-config/terraform/aio
86
86
87
+ - name : Output image tag
88
+ id : image_tag
89
+ run : |
90
+ echo image_tag=$(grep stackhpc_rocky_9_overcloud_host_image_version: etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
91
+ working-directory : ${{ github.workspace }}/src/kayobe-config
92
+
93
+ # Use the image override if set, otherwise use overcloud-os_distribution-os_release-tag
94
+ - name : Output image name
95
+ id : image_name
96
+ run : |
97
+ echo image_name=overcloud-rocky-9-${{ steps.image_tag.outputs.image_tag }} >> $GITHUB_OUTPUT
98
+
87
99
- name : Generate terraform.tfvars
88
100
run : |
89
101
cat << EOF > terraform.tfvars
90
102
ssh_public_key = "id_rsa.pub"
91
- ssh_username = "ubuntu "
103
+ ssh_username = "cloud-user "
92
104
aio_vm_name = "skc-ipa-image-builder"
93
- # Must be an Ubuntu Jammy host to successfully build all images
94
- # This MUST NOT be an LVM image. It can cause confusing conficts with the built image.
95
- aio_vm_image = "Ubuntu-22.04"
105
+ aio_vm_image = "${{ env.VM_IMAGE }}"
96
106
aio_vm_flavor = "en1.medium"
97
107
aio_vm_network = "stackhpc-ci"
98
108
aio_vm_subnet = "stackhpc-ci"
99
109
aio_vm_interface = "ens3"
100
110
EOF
101
111
working-directory : ${{ github.workspace }}/src/kayobe-config/terraform/aio
112
+ env :
113
+ VM_IMAGE : ${{ steps.image_name.outputs.image_name }}
102
114
103
115
- name : Terraform Plan
104
116
run : terraform plan
@@ -170,6 +182,15 @@ jobs:
170
182
source src/kayobe-config/kayobe-env --environment ci-builder &&
171
183
kayobe control host bootstrap
172
184
185
+ - name : Growpart
186
+ run : |
187
+ source venvs/kayobe/bin/activate &&
188
+ source src/kayobe-config/kayobe-env --environment ci-builder &&
189
+ kayobe playbook run src/kayobe-config/etc/kayobe/ansible/growroot.yml \
190
+ -e growroot_group="seed"
191
+ env :
192
+ KAYOBE_VAULT_PASSWORD : ${{ secrets.KAYOBE_VAULT_PASSWORD }}
193
+
173
194
- name : Configure the seed host (Builder VM)
174
195
run : |
175
196
source venvs/kayobe/bin/activate &&
@@ -185,14 +206,6 @@ jobs:
185
206
env :
186
207
KAYOBE_VAULT_PASSWORD : ${{ secrets.KAYOBE_VAULT_PASSWORD }}
187
208
188
- - name : Resize root disk
189
- run : |
190
- source venvs/kayobe/bin/activate &&
191
- source src/kayobe-config/kayobe-env --environment ci-builder &&
192
- kayobe seed host command run --command "resize2fs $(findmnt -n -o SOURCE /)" --show-output --become
193
- env :
194
- KAYOBE_VAULT_PASSWORD : ${{ secrets.KAYOBE_VAULT_PASSWORD }}
195
-
196
209
- name : Build an Ironic Python Agent (IPA) image
197
210
id : build_ipa
198
211
continue-on-error : true
0 commit comments