Commit f2010aae authored by Peter Hutterer's avatar Peter Hutterer
Browse files

bootstrap: change the single-use qemu templates into jobs



We only use each of these templates for a single job so let's make them into
actual jobs. And while we're there, extend the descriptions for each job to
make it more obvious what they do.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent cdb841fd
......@@ -50,13 +50,15 @@ bootstrap@aarch64:
FDO_REPO_SUFFIX: aarch64/buildah
# qemu container capable of running a VM to run the test suite
# qemu container base image. This is the base image for running qemu jobs,
# i.e. when you are building an image with .fdo.qemu-prep@, that image is a gcow
# file inside this image here, to be started with the vmctl script.
#
# installed required packages (in addition to the bootstrap ones):
# Installed required packages (in addition to the bootstrap ones):
# - qemu (of course)
# - genisoimage (to create a cloud-init iso that will help us filling in the custom parameters)
# - usbutils (for being able to call lsusb and redirect part a USB device)
.qemu@x86_64:
bootstrap-qemu@x86_64:
extends: .bootstrap_skeleton@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2
stage: bootstrapping_qemu
......@@ -67,25 +69,15 @@ bootstrap@aarch64:
FDO_REPO_SUFFIX: x86_64/qemu-base
FDO_DISTRIBUTION_PACKAGES: 'qemu genisoimage usbutils'
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl'
needs:
- bootstrap@x86_64
# qemu container capable of creating an other VM image
#
.qemu-mkosi@x86_64:
extends: .qemu@x86_64
# qemu container capable of creating an other VM image. This is the image the
# .fdo.qemu-prep@ templates themselves run on.
bootstrap-qemu-mkosi@x86_64:
extends: bootstrap-qemu@x86_64
tags:
- kvm
variables:
FDO_REPO_SUFFIX: x86_64/qemu-mkosi-base
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl && bootstrap/prep_mkosi.sh'
bootstrap-qemu@x86_64:
extends: .qemu@x86_64
needs:
- bootstrap@x86_64
bootstrap-qemu-mkosi@x86_64:
extends: .qemu-mkosi@x86_64
needs:
- bootstrap@x86_64
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl && bootstrap/prep_mkosi.sh'
\ No newline at end of file
......@@ -50,13 +50,15 @@ bootstrap@aarch64:
FDO_REPO_SUFFIX: aarch64/buildah
# qemu container capable of running a VM to run the test suite
# qemu container base image. This is the base image for running qemu jobs,
# i.e. when you are building an image with .fdo.qemu-prep@, that image is a gcow
# file inside this image here, to be started with the vmctl script.
#
# installed required packages (in addition to the bootstrap ones):
# Installed required packages (in addition to the bootstrap ones):
# - qemu (of course)
# - genisoimage (to create a cloud-init iso that will help us filling in the custom parameters)
# - usbutils (for being able to call lsusb and redirect part a USB device)
.qemu@x86_64:
bootstrap-qemu@x86_64:
extends: .bootstrap_skeleton@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/buildah:{{bootstrap_tag}}
stage: bootstrapping_qemu
......@@ -67,26 +69,15 @@ bootstrap@aarch64:
FDO_REPO_SUFFIX: x86_64/qemu-base
FDO_DISTRIBUTION_PACKAGES: 'qemu genisoimage usbutils'
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl'
needs:
- bootstrap@x86_64
# qemu container capable of creating an other VM image
#
.qemu-mkosi@x86_64:
extends: .qemu@x86_64
# qemu container capable of creating an other VM image. This is the image the
# .fdo.qemu-prep@ templates themselves run on.
bootstrap-qemu-mkosi@x86_64:
extends: bootstrap-qemu@x86_64
tags:
- kvm
variables:
FDO_REPO_SUFFIX: x86_64/qemu-mkosi-base
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl && bootstrap/prep_mkosi.sh'
bootstrap-qemu@x86_64:
extends: .qemu@x86_64
needs:
- bootstrap@x86_64
bootstrap-qemu-mkosi@x86_64:
extends: .qemu-mkosi@x86_64
needs:
- bootstrap@x86_64
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment