From nobody Sun Feb 8 05:07:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1637675555; cv=none; d=zohomail.com; s=zohoarc; b=ZfkI6YUiY51AKWRyvzBUBOESecJfyGT03jkQzYp5JaAwL/8mvohiwyGv34jj46CldIuHOSpQGHC+VUoA0q1MOr/IvWcJJXTqHxroUbAD5DQcqbkwi75EeDBw7xYdcP3ymaXZr52WAdtkpuXx46X6ogvbS7wq5/Wqyp/GWmVSdCU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637675555; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4vjRgroorBBEU/mNahZAU8JSOBJtI5M1bdTTD4F+GaA=; b=GrwHM/8psU4SJT0XmQsJF3CpdMrvbGqQFQgQBFbJNAOfHPhO+EQkNOEWS49QOwFZRiurpgTjUU/Gb9u2Na7BjyExZ4DlIxQ5l3cdNUJp48fBaV8RrPCFNT6pMarqRTbrXK2MH1dKG6WsMH2MZ0MiUDQdx5xB2bJ0AVG5i+uEqi0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1637675555930664.9621797457747; Tue, 23 Nov 2021 05:52:35 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-462-w21bmnvVOTyvrWxU2Vr1YA-1; Tue, 23 Nov 2021 08:52:30 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 302E410B744E; Tue, 23 Nov 2021 13:52:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 13A9A60C5F; Tue, 23 Nov 2021 13:52:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D68FB4EA38; Tue, 23 Nov 2021 13:52:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1ANDqGHO029992 for ; Tue, 23 Nov 2021 08:52:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id 69CF267840; Tue, 23 Nov 2021 13:52:16 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1CE9418E; Tue, 23 Nov 2021 13:52:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637675554; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=4vjRgroorBBEU/mNahZAU8JSOBJtI5M1bdTTD4F+GaA=; b=CX+cbFdoK38yJc2/k91HWhGlfy5JQQqasG7lVQVp/3ewsfvyOz0FxC4E83ffYXICZjMwGB IxpRi6TCgRLCPV3kV3DcdKCpuix1oJxRSdgSAL7AD35U99efpSOtuoyo5Jxg1ICxOhlFdK gsVwHmtnwKbwWRinLc36VGxjZtuPW7U= X-MC-Unique: w21bmnvVOTyvrWxU2Vr1YA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] ci: run a mingw64 job on stable Fedora Date: Tue, 23 Nov 2021 13:51:51 +0000 Message-Id: <20211123135151.46677-4-berrange@redhat.com> In-Reply-To: <20211123135151.46677-1-berrange@redhat.com> References: <20211123135151.46677-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637675556608100001 Both of the current mingw jobs are marked as 'allow_failure' because they are running against Fedora rawhide which is an unstable distro. We need at least one mingw job to be gating to more reliably detect problems. This introduces dockerfiles for both mingw variants on Fedora 35 and sets the mingw64 build to run on Fedora 34, and mingw32 on Fedora rawhide. Signed-off-by: Daniel P. Berrang=C3=A9 --- .../fedora-35-cross-mingw32.Dockerfile | 92 +++++++++++++++++++ .../fedora-35-cross-mingw64.Dockerfile | 92 +++++++++++++++++++ ci/gitlab.yml | 30 ++++-- ci/manifest.yml | 11 ++- 4 files changed, 216 insertions(+), 9 deletions(-) create mode 100644 ci/containers/fedora-35-cross-mingw32.Dockerfile create mode 100644 ci/containers/fedora-35-cross-mingw64.Dockerfile diff --git a/ci/containers/fedora-35-cross-mingw32.Dockerfile b/ci/containe= rs/fedora-35-cross-mingw32.Dockerfile new file mode 100644 index 0000000000..0a26a1f9bd --- /dev/null +++ b/ci/containers/fedora-35-cross-mingw32.Dockerfile @@ -0,0 +1,92 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.fedoraproject.org/fedora:35 + +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ + augeas \ + bash-completion \ + ca-certificates \ + ccache \ + cpp \ + cppi \ + diffutils \ + dnsmasq \ + dwarves \ + ebtables \ + firewalld-filesystem \ + git \ + glibc-langpack-en \ + grep \ + iproute \ + iproute-tc \ + iptables \ + iscsi-initiator-utils \ + kmod \ + libxml2 \ + libxslt \ + lvm2 \ + make \ + meson \ + nfs-utils \ + ninja-build \ + numad \ + parted \ + perl-base \ + polkit \ + python3 \ + python3-docutils \ + python3-flake8 \ + qemu-img \ + radvd \ + rpcgen \ + rpm-build \ + scrub \ + sed \ + sheepdog \ + zfs-fuse && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y + +RUN nosync dnf install -y \ + mingw32-curl \ + mingw32-dbus \ + mingw32-dlfcn \ + mingw32-gcc \ + mingw32-gettext \ + mingw32-glib2 \ + mingw32-gnutls \ + mingw32-headers \ + mingw32-libssh2 \ + mingw32-libxml2 \ + mingw32-pkg-config \ + mingw32-portablexdr \ + mingw32-readline && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc= && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + +ENV ABI "i686-w64-mingw32" +ENV MESON_OPTS "--cross-file=3D/usr/share/mingw/toolchain-mingw32.meson" diff --git a/ci/containers/fedora-35-cross-mingw64.Dockerfile b/ci/containe= rs/fedora-35-cross-mingw64.Dockerfile new file mode 100644 index 0000000000..e2a3ba9d6d --- /dev/null +++ b/ci/containers/fedora-35-cross-mingw64.Dockerfile @@ -0,0 +1,92 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.fedoraproject.org/fedora:35 + +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=3D/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=3D/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ + augeas \ + bash-completion \ + ca-certificates \ + ccache \ + cpp \ + cppi \ + diffutils \ + dnsmasq \ + dwarves \ + ebtables \ + firewalld-filesystem \ + git \ + glibc-langpack-en \ + grep \ + iproute \ + iproute-tc \ + iptables \ + iscsi-initiator-utils \ + kmod \ + libxml2 \ + libxslt \ + lvm2 \ + make \ + meson \ + nfs-utils \ + ninja-build \ + numad \ + parted \ + perl-base \ + polkit \ + python3 \ + python3-docutils \ + python3-flake8 \ + qemu-img \ + radvd \ + rpcgen \ + rpm-build \ + scrub \ + sed \ + sheepdog \ + zfs-fuse && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y + +RUN nosync dnf install -y \ + mingw64-curl \ + mingw64-dbus \ + mingw64-dlfcn \ + mingw64-gcc \ + mingw64-gettext \ + mingw64-glib2 \ + mingw64-gnutls \ + mingw64-headers \ + mingw64-libssh2 \ + mingw64-libxml2 \ + mingw64-pkg-config \ + mingw64-portablexdr \ + mingw64-readline && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= gcc + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + +ENV ABI "x86_64-w64-mingw32" +ENV MESON_OPTS "--cross-file=3D/usr/share/mingw/toolchain-mingw64.meson" diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 964e93d6d4..120ece8fb7 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -342,6 +342,20 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x =20 =20 +mingw32-fedora-35-container: + extends: .container_job + allow_failure: true + variables: + NAME: fedora-35-cross-mingw32 + + +mingw64-fedora-35-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-35-cross-mingw64 + + mingw32-fedora-rawhide-container: extends: .container_job allow_failure: true @@ -609,24 +623,24 @@ s390x-debian-sid: CROSS: s390x =20 =20 -mingw32-fedora-rawhide: +mingw64-fedora-35: extends: .cross_build_job needs: - - mingw32-fedora-rawhide-container - allow_failure: true + - mingw64-fedora-35-container + allow_failure: false variables: - NAME: fedora-rawhide - CROSS: mingw32 + NAME: fedora-35 + CROSS: mingw64 =20 =20 -mingw64-fedora-rawhide: +mingw32-fedora-rawhide: extends: .cross_build_job needs: - - mingw64-fedora-rawhide-container + - mingw32-fedora-rawhide-container allow_failure: true variables: NAME: fedora-rawhide - CROSS: mingw64 + CROSS: mingw32 =20 =20 # Native cirrus build jobs diff --git a/ci/manifest.yml b/ci/manifest.yml index 460fdb4d34..2b64effef8 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -127,7 +127,15 @@ targets: =20 fedora-34: x86_64 =20 - fedora-35: x86_64 + fedora-35: + jobs: + - arch: x86_64 + + - arch: mingw32 + allow-failure: true + builds: false + + - arch: mingw64 =20 fedora-rawhide: jobs: @@ -146,6 +154,7 @@ targets: =20 - arch: mingw64 allow-failure: true + builds: false =20 freebsd-12: x86_64 =20 --=20 2.33.1