From ef41cc28b465a620663e4e0034bbbf50e1fc63d6 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 1 Mar 2021 13:55:03 +0000 Subject: [PATCH] ci: Ensure the machine-id is set on the Fedora CI image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Run `systemd-machine-id-setup` when creating the image, so that `/etc/machine-id` is created with a valid ID. Since systemd isn’t started when running the CI image with podman/Docker, it’s not created otherwise. This causes some tests to fail. Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 2 +- .gitlab-ci/fedora.Dockerfile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc61edf1e..e6b29dd04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ cache: - _ccache/ variables: - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v9" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v10" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v1" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v7" ANDROID_IMAGE: "registry.gitlab.gnome.org/gnome/glib/android-ndk:v3" diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 39553e280..139d87fb8 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,5 +1,8 @@ FROM fedora:31 +# Set /etc/machine-id as it’s needed for some D-Bus tests +RUN systemd-machine-id-setup + RUN dnf -y update \ && dnf -y install \ bindfs \