Commit 79eee02a authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

qemu: use a fixed mkosi known sha



Looks like the current tip of mkosi is trying to install `usrmerge` which
is not part of the available debian stretch packages.
We used to work with b103e7eb33b96d8a24 in the previous images, so stick
to it.
Signed-off-by: Benjamin Tissoires's avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
parent 0a522a46
Pipeline #179713 passed with stages
in 34 minutes and 31 seconds
......@@ -50,7 +50,7 @@
extends:
- .fdo.qemu-build@debian
- .ci-commons-debian
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-07-20.3
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-07-20.5
stage: debian_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -224,7 +224,7 @@ debian:stretch@qemu-build:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-07-20.3
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-07-20.5
debian:stretch@qemu-check:
......
......@@ -50,7 +50,7 @@
extends:
- .fdo.qemu-build@fedora
- .ci-commons-fedora
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-07-20.3
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-07-20.5
stage: fedora_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -224,7 +224,7 @@ fedora:31@qemu-build:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-07-20.3
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-07-20.5
fedora:31@qemu-check:
......
......@@ -50,7 +50,7 @@
extends:
- .fdo.qemu-build@ubuntu
- .ci-commons-ubuntu
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-07-20.3
image: $CI_REGISTRY_IMAGE/qemu-mkosi-base:2020-07-20.5
stage: ubuntu_container_build
artifacts:
name: logs-$CI_PIPELINE_ID
......@@ -224,7 +224,7 @@ ubuntu:19.10@qemu-build:
variables:
FDO_DISTRIBUTION_TAG: fdo-ci-qemu-$CI_PIPELINE_ID
FDO_DISTRIBUTION_PACKAGES: 'wget curl'
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-07-20.3
QEMU_BASE_IMAGE: $CI_REGISTRY_IMAGE/qemu-base:2020-07-20.5
ubuntu:19.10@qemu-check:
......
......@@ -57,7 +57,7 @@
stage: bootstrapping_qemu
dependencies: []
variables:
FDO_DISTRIBUTION_TAG: '2020-07-20.3'
FDO_DISTRIBUTION_TAG: '2020-07-20.5'
FDO_BASE_IMAGE: $CI_REGISTRY_IMAGE/buildah:2020-07-20.1
FDO_REPO_SUFFIX: qemu-base
FDO_DISTRIBUTION_PACKAGES: 'qemu genisoimage usbutils'
......
......@@ -67,6 +67,7 @@ genisoimage -output /app/my-seed.iso \
/app/vmctl exec dnf install -y mkosi systemd-container
# use the upstream mkosi code
/app/vmctl exec git clone https://github.com/systemd/mkosi.git
/app/vmctl exec 'cd mkosi ; git checkout b103e7eb33b96d8a241a5e7a456835bfda86c823'
# pacman needs 5.2.0 to work, fedora is still on 5.0.0
# https://bugzilla.redhat.com/show_bug.cgi?id=1582967
......
......@@ -136,4 +136,4 @@ globals:
bootstrap_tag: '2020-07-20.1'
## @qemu_tag: the current image tag associated with this qemu bootstrap image
qemu_tag: '2020-07-20.3'
qemu_tag: '2020-07-20.5'
......@@ -313,7 +313,7 @@
extends: .fdo.container-build@debian
tags:
- kvm
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-07-20.3
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-07-20.5
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -411,7 +411,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-07-20.3}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-07-20.5}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
......@@ -303,7 +303,7 @@
extends: .fdo.container-build@fedora
tags:
- kvm
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-07-20.3
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-07-20.5
script:
# log in to the registry
- podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
......@@ -402,7 +402,7 @@
graphroot = "/var/lib/containers/storage"
EOF
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-07-20.3}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-07-20.5}
- echo Building $FDO_REPO_SUFFIX:$DISTRO_TAG from $QEMU_BASE_IMAGE
......
......@@ -312,7 +312,7 @@
extends: .fdo.container-build@ubuntu
tags:
- kvm
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-07-20.3
image: $CI_REGISTRY/freedesktop/ci-templates/qemu-mkosi-base:2020-07-20.5
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:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-07-20.3}
- QEMU_BASE_IMAGE=${QEMU_BASE_IMAGE:-$CI_REGISTRY/freedesktop/ci-templates/qemu-base:2020-07-20.5}
- 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