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

bootstrap: change the single-use bootstrap templates into jobs



We only use each of these templates for a single job so let's make them into
actual jobs.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 66825908
......@@ -23,11 +23,14 @@ stages:
FDO_DISTRIBUTION_TAG: '2020-12-18.2'
# Builds an image that the .fdo.container-build@ templates run on
# to compose a distribution-specific image.
#
# we need a minimalist image capable of buildah, podman, skopeo, curl,
# jq, date and test. We used to rely on `bootstrap/bootstrap.sh`, but
# a commit in runc prevented it to be compiled against musl. So we just
# end up building a regular container image.
.bootstrap@x86_64:
bootstrap@x86_64:
extends: .bootstrap_skeleton@x86_64
image: fedora:33
before_script:
......@@ -37,8 +40,9 @@ stages:
FDO_DISTRIBUTION_EXEC: 'bash bootstrap/bootstrap_fedora.sh'
.bootstrap@aarch64:
extends: .bootstrap@x86_64
# same but for aarch64
bootstrap@aarch64:
extends: bootstrap@x86_64
image: arm64v8/fedora:33
tags:
- aarch64
......@@ -75,14 +79,6 @@ stages:
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl && bootstrap/prep_mkosi.sh'
bootstrap@x86_64:
extends: .bootstrap@x86_64
bootstrap@aarch64:
extends: .bootstrap@aarch64
bootstrap-qemu@x86_64:
extends: .qemu@x86_64
needs:
......
......@@ -23,11 +23,14 @@ stages:
FDO_DISTRIBUTION_TAG: '{{bootstrap_tag}}'
# Builds an image that the .fdo.container-build@ templates run on
# to compose a distribution-specific image.
#
# we need a minimalist image capable of buildah, podman, skopeo, curl,
# jq, date and test. We used to rely on `bootstrap/bootstrap.sh`, but
# a commit in runc prevented it to be compiled against musl. So we just
# end up building a regular container image.
.bootstrap@x86_64:
bootstrap@x86_64:
extends: .bootstrap_skeleton@x86_64
image: {{bootstrap_distro}}:{{bootstrap_distro_version}}
before_script:
......@@ -37,8 +40,9 @@ stages:
FDO_DISTRIBUTION_EXEC: 'bash bootstrap/bootstrap_{{bootstrap_distro}}.sh'
.bootstrap@aarch64:
extends: .bootstrap@x86_64
# same but for aarch64
bootstrap@aarch64:
extends: bootstrap@x86_64
image: arm64v8/{{bootstrap_distro}}:{{bootstrap_distro_version}}
tags:
- aarch64
......@@ -75,14 +79,6 @@ stages:
FDO_DISTRIBUTION_EXEC: 'mkdir -p /app && cp bootstrap/vmctl.sh /app/vmctl && bootstrap/prep_mkosi.sh'
bootstrap@x86_64:
extends: .bootstrap@x86_64
bootstrap@aarch64:
extends: .bootstrap@aarch64
bootstrap-qemu@x86_64:
extends: .qemu@x86_64
needs:
......
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