From nobody Sun Feb 8 06:54:23 2026 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 --- 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