openstack/metalsmith
Code Issues Proposed changes

Use bootloader element instead of grub2

Browse Source 
bootloader is recommended since it aims to build a valid grub config
instead of just installing the packages.

Also, mark legacy job as non-voting for the time being

The legacy job is broken because of a know issue with tinycore related
to the glibc library.  Moving it to non-voting for the time being while
we evaluate if it's worth trying to fix it or jsut remove it.

Also, install diskimage-builder from the checked-out repo, so that
depends on works as expected.

Change-Id: I642a1579e95dfff2188206313ea6d315b0533a5f
This commit is contained in:
Steve Baker 2024-04-17 08:16:54 +12:00
parent 198df8e4be
commit 7f42d1cadf
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.zuul.yaml
View File

@ -187,7 +187,11 @@
check: check:
jobs: jobs:
- metalsmith-integration-glance-centos9-uefi - metalsmith-integration-glance-centos9-uefi
- metalsmith-integration-glance-centos9-legacy # NOTE(rpittau): this is broken because of an issue with tinycore
# moving to non-voting while we evaluate if it's worth trying to
# fix it or just removing it
- metalsmith-integration-glance-centos9-legacy:
voting: false
- metalsmith-integration-http-cirros - metalsmith-integration-http-cirros
- openstack-tox-linters - openstack-tox-linters
- metalsmith-tox-codespell: - metalsmith-tox-codespell:
@ -195,6 +199,5 @@
gate: gate:
jobs: jobs:
- metalsmith-integration-glance-centos9-uefi - metalsmith-integration-glance-centos9-uefi
- metalsmith-integration-glance-centos9-legacy
- metalsmith-integration-http-cirros - metalsmith-integration-http-cirros
- openstack-tox-linters - openstack-tox-linters

6
playbooks/integration/centos8-image.yaml
View File

@ -14,7 +14,7 @@
- name: Install DIB - name: Install DIB
pip: pip:
name: diskimage-builder name: "/home/zuul/src/opendev.org/openstack/diskimage-builder"
become: true become: true
vars: vars:
ansible_python_interpreter: /usr/bin/{{ metalsmith_python | default('python') }} ansible_python_interpreter: /usr/bin/{{ metalsmith_python | default('python') }}
@ -30,13 +30,13 @@
- name: Build a centos8 wholedisk image - name: Build a centos8 wholedisk image
command: > command: >
disk-image-create centos grub2 vm {{ centos_block_device | default('') }} disk-image-create centos bootloader vm {{ centos_block_device | default('') }}
-o centos8-wholedisk -o centos8-wholedisk
environment: environment:
DIB_RELEASE: 8-stream DIB_RELEASE: 8-stream
- name: Build a centos8 partition image - name: Build a centos8 partition image
command: disk-image-create centos grub2 baremetal -o centos8-partition command: disk-image-create centos bootloader baremetal -o centos8-partition
environment: environment:
DIB_RELEASE: 8-stream DIB_RELEASE: 8-stream

6
playbooks/integration/centos9-image.yaml
View File

@ -14,7 +14,7 @@
- name: Install DIB - name: Install DIB
pip: pip:
name: diskimage-builder name: "/home/zuul/src/opendev.org/openstack/diskimage-builder"
become: true become: true
vars: vars:
ansible_python_interpreter: /usr/bin/{{ metalsmith_python | default('python') }} ansible_python_interpreter: /usr/bin/{{ metalsmith_python | default('python') }}
@ -30,13 +30,13 @@
- name: Build a centos9 wholedisk image - name: Build a centos9 wholedisk image
command: > command: >
disk-image-create centos grub2 vm {{ centos_block_device | default('') }} disk-image-create -x centos bootloader vm {{ centos_block_device | default('') }}
-o centos9-wholedisk -o centos9-wholedisk
environment: environment:
DIB_RELEASE: 9-stream DIB_RELEASE: 9-stream
- name: Build a centos9 partition image - name: Build a centos9 partition image
command: disk-image-create centos grub2 baremetal -o centos9-partition command: disk-image-create -x centos bootloader baremetal -o centos9-partition
environment: environment:
DIB_RELEASE: 9-stream DIB_RELEASE: 9-stream