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

bootstrap: use the system-provided mkosi

Fedora 33 now provides mkosi 9 which includes the fixes required by
fe075a38

. Let's stick with the packaged version instead of a custom git
checkout.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 79c32592
Pipeline #271324 passed with stages
in 2 minutes and 43 seconds
......@@ -260,7 +260,7 @@ publish to quay.io:
FDO_ARCHITECTURE:
- x86_64
FDO_DISTRIBUTION_TAG:
- '2020-12-18.2'
- '2021-02-15.0'
variables:
# local format, e.g. x86_64/mkosi-base-12324
# distant format, e.g. mkosi-base-x86_64-12324
......@@ -293,7 +293,7 @@ test published images:
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-18.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-18.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-18.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-18.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2021-02-15.0
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2021-02-15.0
rules:
- if: '$CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH == "freedesktop/ci-templates"'
\ No newline at end of file
......@@ -58,7 +58,7 @@ stages:
stage: bootstrapping_qemu
dependencies: []
variables:
FDO_DISTRIBUTION_TAG: '2020-12-18.2'
FDO_DISTRIBUTION_TAG: '2021-02-15.0'
FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/buildah:2020-12-18.2
FDO_REPO_SUFFIX: x86_64/qemu-base
FDO_DISTRIBUTION_PACKAGES: 'qemu genisoimage usbutils'
......
......@@ -63,7 +63,7 @@ stages:
extends:
- .fdo.qemu-build@debian@x86_64
- .ci-commons-debian@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-18.2
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2021-02-15.0
stage: debian_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -230,7 +230,7 @@ debian:stretch@qemu-build@x86_64:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-18.2
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2021-02-15.0
debian:stretch@qemu-check@x86_64:
......
......@@ -63,7 +63,7 @@ stages:
extends:
- .fdo.qemu-build@fedora@x86_64
- .ci-commons-fedora@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-18.2
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2021-02-15.0
stage: fedora_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -230,7 +230,7 @@ fedora:33@qemu-build@x86_64:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-18.2
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2021-02-15.0
fedora:33@qemu-check@x86_64:
......
......@@ -63,7 +63,7 @@ stages:
extends:
- .fdo.qemu-build@ubuntu@x86_64
- .ci-commons-ubuntu@x86_64
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2020-12-18.2
image: $CI_REGISTRY_IMAGE/x86_64/qemu-mkosi-base:2021-02-15.0
stage: ubuntu_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -230,7 +230,7 @@ ubuntu:20.10@qemu-build@x86_64:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-x86_64-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2020-12-18.2
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/x86_64/qemu-base:2021-02-15.0
ubuntu:20.10@qemu-check@x86_64:
......
......@@ -65,12 +65,6 @@ genisoimage -output /app/my-seed.iso \
# install mkosi dependencies to build up our final VM image
/app/vmctl exec dnf install -y mkosi systemd-container git-core
# and remove mkosi itself because we'll install it from git
/app/vmctl exec dnf remove -y --noautoremove mkosi
# use the upstream mkosi code
/app/vmctl exec git clone https://github.com/systemd/mkosi.git
# Check out a definitely working commit
/app/vmctl exec 'cd mkosi ; git checkout 74d2d42ce2d170c32269118cf29c664f73abf0a5 ; pip install --prefix=/usr .'
# pacman needs 5.2.0 to work, fedora is still on 5.0.0
# https://bugzilla.redhat.com/show_bug.cgi?id=1582967
......
......@@ -2,7 +2,7 @@
bootstrap_tag: '2020-12-18.2'
## @qemu_tag: the current image tag associated with this qemu bootstrap image
qemu_tag: '2020-12-18.2'
qemu_tag: '2021-02-15.0'
## @ci_templates_registry_path: the path to where the templates should look
## for bootstrap images.
......
......@@ -365,7 +365,7 @@
extends: .fdo.container-build@debian@x86_64
tags:
- kvm
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-18.2
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2021-02-15.0
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -464,7 +464,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-18.2}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2021-02-15.0}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
......@@ -355,7 +355,7 @@
extends: .fdo.container-build@fedora@x86_64
tags:
- kvm
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-18.2
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2021-02-15.0
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -455,7 +455,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-18.2}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2021-02-15.0}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
......@@ -364,7 +364,7 @@
extends: .fdo.container-build@ubuntu@x86_64
tags:
- kvm
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-18.2
image: quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2021-02-15.0
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -511,7 +511,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-18.2}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2021-02-15.0}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
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