From nobody Tue Apr 23 18:21:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1637675542; cv=none; d=zohomail.com; s=zohoarc; b=V11uaOO7mURXSusOPxEmDg3PWUBllHCWbpHyCxqcMNx8+Or7hLL4/i9kqqtCxY2Sq5fDsxvfkchURybr/tLJC7/AX4kzdEVuoqpqHjv/JarosES2j+YKe3Qze60oKY+/I10cXcxJ7QFtJTBiIgmTLoESnh7okpKjEv7VUytgIjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637675542; 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=9E9yW7VNZ+yoSwWObfKIl/sgRm6/JT1/eUvINqnBAfA=; b=czaQlm4XV8K15hU/aKpjUTuo685v8JiKbemZlEYdkj7WL95irmygzq9uo88zIib/+QoKT5PtfExZIclBaU5N8u3zrkdUbxnz98SyX1y8IZJ7B1BjBQE9oJp0brbnnJp8tSCgUHNbce/w/frt9aQToS+n20dhY8UeO5Cp2kaBuwA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 163767554214490.68238526943492; Tue, 23 Nov 2021 05:52:22 -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-355-4bAXlC3FOGqCgEQ8Bao4nQ-1; Tue, 23 Nov 2021 08:52:19 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3489B9F92E; Tue, 23 Nov 2021 13:52:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 09A166784D; Tue, 23 Nov 2021 13:52:14 +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 4FF6A1832E84; Tue, 23 Nov 2021 13:52:13 +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 1ANDqCdp029971 for ; Tue, 23 Nov 2021 08:52:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0EA9B5B826; Tue, 23 Nov 2021 13:52:12 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 197AE6785D; Tue, 23 Nov 2021 13:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637675541; 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=9E9yW7VNZ+yoSwWObfKIl/sgRm6/JT1/eUvINqnBAfA=; b=ZIDYLPuevTR7xsQNmRMzM68dyppEmuv0ZSpK4oGscgQ+6osJ3uSoh3savMWeiPvIT4mggN FSNMoOm93h+KCM9W6l5kdCp39k9wrdkflxb2OcKvVi9xcGGkSYz0zF4/vKWVKH5gJ1aq0P xTGXRB1UJMefOPaZJJBB7KcH9plgUdk= X-MC-Unique: 4bAXlC3FOGqCgEQ8Bao4nQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] ci: replace Fedora 33 with Fedora 35 Date: Tue, 23 Nov 2021 13:51:49 +0000 Message-Id: <20211123135151.46677-2-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.11 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: 1637675542632100001 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- ...ora-33.Dockerfile =3D> fedora-35.Dockerfile} | 2 +- ci/gitlab.yml | 20 +++++++++---------- ci/manifest.yml | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) rename ci/containers/{fedora-33.Dockerfile =3D> fedora-35.Dockerfile} (98%) diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-35.D= ockerfile similarity index 98% rename from ci/containers/fedora-33.Dockerfile rename to ci/containers/fedora-35.Dockerfile index 0025e66d6a..1c5cb2c8ca 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-35.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM registry.fedoraproject.org/fedora:33 +FROM registry.fedoraproject.org/fedora:35 =20 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 70e80f51b7..964e93d6d4 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -115,18 +115,18 @@ x86_64-debian-sid-container: NAME: debian-sid =20 =20 -x86_64-fedora-33-container: +x86_64-fedora-34-container: extends: .container_job allow_failure: false variables: - NAME: fedora-33 + NAME: fedora-34 =20 =20 -x86_64-fedora-34-container: +x86_64-fedora-35-container: extends: .container_job allow_failure: false variables: - NAME: fedora-34 + NAME: fedora-35 =20 =20 x86_64-fedora-rawhide-container: @@ -425,22 +425,22 @@ x86_64-debian-sid: NAME: debian-sid =20 =20 -x86_64-fedora-33: +x86_64-fedora-34: extends: .native_build_job needs: - - x86_64-fedora-33-container + - x86_64-fedora-34-container allow_failure: false variables: - NAME: fedora-33 + NAME: fedora-34 =20 =20 -x86_64-fedora-34: +x86_64-fedora-35: extends: .native_build_job needs: - - x86_64-fedora-34-container + - x86_64-fedora-35-container allow_failure: false variables: - NAME: fedora-34 + NAME: fedora-35 =20 =20 x86_64-fedora-rawhide: diff --git a/ci/manifest.yml b/ci/manifest.yml index 49d5fe7064..460fdb4d34 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -125,10 +125,10 @@ targets: - arch: s390x allow-failure: true =20 - fedora-33: x86_64 - fedora-34: x86_64 =20 + fedora-35: x86_64 + fedora-rawhide: jobs: - arch: x86_64 --=20 2.33.1 From nobody Tue Apr 23 18:21:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1637675549; cv=none; d=zohomail.com; s=zohoarc; b=JlP7S97HcP4oLd7dzr/YpDl9U0XZjenKQgjbfIJF/8TsWO9F2x/648sE4wCx7ctT/YjIGJ5MGrbyuWq+FS9Fq4u1X6rHEGMdASGO/qOA3knKs72Lijno3u4uaocWxyG823tP7qfUoP/xPjXoDs0pBOT1wU/vumNR0KCiPVvBszg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637675549; 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=H4Q4EO5Dg1p7Yn5PO6cXOBuv3x5f3dXf3ZpYUgR2K/o=; b=HYGncoP+kZH0Q1Tn1/AYmkBmpxUjdFZQeWevsgs0Qap4unWuf7INXKf95EuW+xRbBgeofsMnNFV3iJjgskF0eNKZO6mEnlPBHvrQ7f4jb8dRPJtjwQGFJ9PKK1w+mI5cZVq21/my/wV2oiYZmzVWM91NVB7bbPJMMRM3uozqedw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1637675549299669.9544009338983; Tue, 23 Nov 2021 05:52:29 -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-145-p0WbwQRrOleXG2u9rXi7JQ-1; Tue, 23 Nov 2021 08:52:26 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5CDAD10168D7; Tue, 23 Nov 2021 13:52:21 +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 378FD60C25; Tue, 23 Nov 2021 13:52:21 +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 0A6D14E9F5; Tue, 23 Nov 2021 13:52:21 +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 1ANDqDxV029976 for ; Tue, 23 Nov 2021 08:52:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id A7A68652AC; Tue, 23 Nov 2021 13:52:13 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8846D418E; Tue, 23 Nov 2021 13:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637675548; 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=H4Q4EO5Dg1p7Yn5PO6cXOBuv3x5f3dXf3ZpYUgR2K/o=; b=GYg6B05HVDMtBLjyYT5371RxvWjHM9eh/u2ffjhqECvWsF3SV0LwuW7nj2L3Q5BkYa+iie 7dW/1ExNe07EiPKdXUbcgeuItHVMsKLh5RDNjaKQvbkf3MS3IT8ddE00cfkYhIIFsw5feP e1UQkLfU7f3Z0mdkTjodFNo9heJjrWg= X-MC-Unique: p0WbwQRrOleXG2u9rXi7JQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] ci: refresh variables/dockerfiles with latest content Date: Tue, 23 Nov 2021 13:51:50 +0000 Message-Id: <20211123135151.46677-3-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.14 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: 1637675550631100001 - The Cirrus CI variables are now sorted - The dockerfiles update commands changed for some distros - Meson in CentOS is now new enough to use Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- ci/cirrus/freebsd-12.vars | 7 +++++-- ci/cirrus/freebsd-13.vars | 7 +++++-- ci/cirrus/freebsd-current.vars | 7 +++++-- ci/cirrus/macos-11.vars | 7 +++++-- ci/containers/centos-8.Dockerfile | 7 +------ ci/containers/centos-stream-8.Dockerfile | 7 +------ ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 2 +- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 2 +- ci/containers/fedora-rawhide.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 2 +- 10 files changed, 26 insertions(+), 24 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 4318b255e9..4845d8d461 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -4,10 +4,13 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -PACKAGING_COMMAND=3D'pkg' CCACHE=3D'/usr/local/bin/ccache' +CPAN_PKGS=3D'' +CROSS_PKGS=3D'' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' -PYTHON=3D'/usr/local/bin/python3' +PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' PKGS=3D'augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbu= s diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gn= utls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja p= erl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline y= ajl' +PYPI_PKGS=3D'' +PYTHON=3D'/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index 4318b255e9..4845d8d461 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -4,10 +4,13 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -PACKAGING_COMMAND=3D'pkg' CCACHE=3D'/usr/local/bin/ccache' +CPAN_PKGS=3D'' +CROSS_PKGS=3D'' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' -PYTHON=3D'/usr/local/bin/python3' +PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' PKGS=3D'augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbu= s diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gn= utls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja p= erl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline y= ajl' +PYPI_PKGS=3D'' +PYTHON=3D'/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 4318b255e9..4845d8d461 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -4,10 +4,13 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -PACKAGING_COMMAND=3D'pkg' CCACHE=3D'/usr/local/bin/ccache' +CPAN_PKGS=3D'' +CROSS_PKGS=3D'' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' -PYTHON=3D'/usr/local/bin/python3' +PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' PKGS=3D'augeas bash-completion ca_root_nss ccache cppi curl cyrus-sasl dbu= s diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gn= utls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja p= erl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu radvd readline y= ajl' +PYPI_PKGS=3D'' +PYTHON=3D'/usr/local/bin/python3' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index 065d86aa45..6bc25aa380 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -4,10 +4,13 @@ # # https://gitlab.com/libvirt/libvirt-ci =20 -PACKAGING_COMMAND=3D'brew' CCACHE=3D'/usr/local/bin/ccache' +CPAN_PKGS=3D'' +CROSS_PKGS=3D'' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' -PYTHON=3D'/usr/local/bin/python3' +PACKAGING_COMMAND=3D'brew' PIP3=3D'/usr/local/bin/pip3' PKGS=3D'augeas bash-completion ccache cppi curl dbus diffutils dnsmasq doc= utils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh l= ibssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readli= ne rpcgen scrub yajl' +PYPI_PKGS=3D'' +PYTHON=3D'/usr/local/bin/python3' diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Doc= kerfile index 5ac1e45459..05793fee4c 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -63,6 +63,7 @@ RUN dnf update -y && \ libxslt \ lvm2 \ make \ + meson \ netcf-devel \ nfs-utils \ ninja-build \ @@ -76,9 +77,6 @@ RUN dnf update -y && \ python3 \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-img \ radvd \ readline-devel \ @@ -99,9 +97,6 @@ RUN dnf update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN pip3 install \ - meson=3D=3D0.56.0 - ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/cento= s-stream-8.Dockerfile index 6baf576580..895fc06aa1 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -63,6 +63,7 @@ RUN dnf update -y && \ libxslt \ lvm2 \ make \ + meson \ netcf-devel \ nfs-utils \ ninja-build \ @@ -76,9 +77,6 @@ RUN dnf update -y && \ python3 \ python3-docutils \ python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ qemu-img \ radvd \ readline-devel \ @@ -99,9 +97,6 @@ RUN dnf update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN pip3 install \ - meson=3D=3D0.56.0 - ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw32.Dockerfile index 8b9a9d61ae..31006b8092 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -17,7 +17,7 @@ else\n\ fi\n\ exec "$@"' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ + nosync dnf distro-sync -y && \ nosync dnf install -y \ augeas \ bash-completion \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/con= tainers/fedora-rawhide-cross-mingw64.Dockerfile index 6293658420..c9b01984b5 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -17,7 +17,7 @@ else\n\ fi\n\ exec "$@"' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ + nosync dnf distro-sync -y && \ nosync dnf install -y \ augeas \ bash-completion \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora= -rawhide.Dockerfile index 74e1f01483..97476535b9 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -17,7 +17,7 @@ else\n\ fi\n\ exec "$@"' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ + nosync dnf distro-sync -y && \ nosync dnf install -y \ audit-libs-devel \ augeas \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/o= pensuse-tumbleweed.Dockerfile index be2d6b6d25..4687f503d7 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -6,7 +6,7 @@ =20 FROM registry.opensuse.org/opensuse/tumbleweed:latest =20 -RUN zypper update -y && \ +RUN zypper dist-upgrade -y && \ zypper install -y \ audit-devel \ augeas \ --=20 2.33.1 From nobody Tue Apr 23 18:21:26 2024 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 Reviewed-by: Michal Privoznik --- .../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