From nobody Tue May 14 16:39:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682066517; cv=none; d=zohomail.com; s=zohoarc; b=RPYKTGApe0ave4Y4zt6f5Ab2FtjI0IJr8GSqiZ5Vj/9bDT87YVFZw0tcT/34fTmm8PoZq4pawp6Wj7dQwxY3o56FApNOw12thnTtOpuNcjFMWDqahu1fMSim4DK1rnNj9fubaUP5lVyDEuPTch8lHX2uyUV/TObnAETvYPe/0/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682066517; h=Content-Type:Content-Transfer-Encoding:Cc: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=kIB/QotKeT2p8OO4tQ9BKrq03nO9wZG4in3EzRy+oUA=; b=ETSl4SMVLJ4untZWRVunJJCQyNoBHd/dUwdoAO98vtvLbqOGzDLBPk87u+vcK+eCRaPPICarKp5UixWw3U4mPLgmFf8qq8tQBkWQD8y6Em6XuP4Wt933lZjEkKvZxMyz7otI9W1Yj4030jEWEwacTFhA6N9+Qy+Z6bpRQA42R3Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16820665170311014.2539566255224; Fri, 21 Apr 2023 01:41:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppmKO-00031U-4f; Fri, 21 Apr 2023 04:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppmKN-00031C-0V for qemu-devel@nongnu.org; Fri, 21 Apr 2023 04:41:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppmKK-0001sK-J8 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 04:41:10 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-339-3_QzN2YxND2R1iIYp1CFdw-1; Fri, 21 Apr 2023 04:41:04 -0400 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-504ecbc85c2so1552249a12.1 for ; Fri, 21 Apr 2023 01:41:04 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id n20-20020a05640206d400b00504b203c4f1sm1661846edy.40.2023.04.21.01.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 01:41:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682066468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kIB/QotKeT2p8OO4tQ9BKrq03nO9wZG4in3EzRy+oUA=; b=My6lvFMr7rE91n+A7r5Mk6u6AaRwhZJS9CrV/OozZMyOvEWCSSc5xGBMSv9KRbEcy2TONV s0edmN57f55R9hX2V1/mUh9tJrMa5dbvO63nGlSmYl3uV3xMTcnO6gMMiGRYCR6KLt/1G2 mvbtiqigM+IQ2CiVE2dAp6ajFYQ/9Nk= X-MC-Unique: 3_QzN2YxND2R1iIYp1CFdw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682066463; x=1684658463; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kIB/QotKeT2p8OO4tQ9BKrq03nO9wZG4in3EzRy+oUA=; b=PAiSTfRn8II7fs8DiqCcJ55KiOHE0k/FqDM27HbmjsNAUnAp+9zqWGXu1Ua3ZNqQmc M7IOfjVzTdZLbBgYdNSyEzokXv+Oo6rtUKkXPcIXq27g9X1RPoRv8KXAVY/BSMniGe+M vAQ1np9SA6r+uDf9BDuCKL8fXd25Nf1l5KcFh/gY2FJLb8S5KfQjNx5/I4XmBXImk1oY xTbHSm13CcBrF8ietRnZZTxWgI8qtxhZqb/4/By+52ihFUJQdsQ3TfR2RLFLjWMpjr0S GDHJG0vea/DO+hxAeZlClMrtij/7WDFiBsVUsVPyUzL6mHv2PU2wHehmGRDCCr+cP9jE LTJA== X-Gm-Message-State: AAQBX9dRL1DBe2Qi+Kk9zhQ4CdqqfMR4d3z9cMx6B00EZd0nTgPkqmbO Y9Cf0fLxg6ZhAznQ3eYr1w3hBNazyuwE0UEDnCp/ybBcix3/SBbKxPhbALpQ3knieB/vbUBcMk7 KQtZP+ZGeJ0ne6VTX/Qw5omRoPnlmiSSFLBRCAMshm1d8ubE0mzD71aKGWbY1rc1RBEwfQJ+s4d ApAg== X-Received: by 2002:aa7:da8e:0:b0:506:ad45:49b1 with SMTP id q14-20020aa7da8e000000b00506ad4549b1mr4183067eds.42.1682066462949; Fri, 21 Apr 2023 01:41:02 -0700 (PDT) X-Google-Smtp-Source: AKy350ZfEcua82lWRkbQCJe+ZToCJi7f3YT8VCoh9+U2mHrxOvRdptJaUtdpT3p+TXlb+ozjN0wXNA== X-Received: by 2002:aa7:da8e:0:b0:506:ad45:49b1 with SMTP id q14-20020aa7da8e000000b00506ad4549b1mr4183050eds.42.1682066462499; Fri, 21 Apr 2023 01:41:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: pkrempa@redhat.com, berrange@redhat.com Subject: [PATCH v3 1/2] tests: libvirt-ci: Update to commit '2fa24dce8bc' Date: Fri, 21 Apr 2023 10:40:58 +0200 Message-Id: <20230421084059.9142-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421084059.9142-1-pbonzini@redhat.com> References: <20230421084059.9142-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682066518526100007 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Update to commit which has fixes needed for OpenSUSE 15.4 and re-generate output files. Signed-off-by: Peter Krempa Message-Id: Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/centos8.docker | 1 - tests/docker/dockerfiles/debian-amd64-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-arm64-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-armel-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-armhf-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-mips64el-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-mipsel-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora-win32-cross.docker | 5 ++--- tests/docker/dockerfiles/fedora-win64-cross.docker | 5 ++--- tests/docker/dockerfiles/fedora.docker | 5 ++--- tests/docker/dockerfiles/opensuse-leap.docker | 1 - tests/lcitool/libvirt-ci | 2 +- 14 files changed, 23 insertions(+), 28 deletions(-) diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index 7e3a6217ae2d..1a6a9087c11f 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -100,7 +100,6 @@ RUN dnf distro-sync -y && \ python38-setuptools \ python38-wheel \ rdma-core-devel \ - rpm \ sed \ snappy-devel \ socat \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index afb1cbd04638..2e7eb445f161 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -148,7 +148,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/x86_64-linux-gnu-gcc'\n\ ar =3D '/usr/bin/x86_64-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/x86_64-linux-gnu-strip'\n\ @@ -158,7 +158,7 @@ pkgconfig =3D '/usr/bin/x86_64-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'x86_64'\n\ cpu =3D 'x86_64'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/x86_64-linux-gnu && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/x86_64-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-c+= + && \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index b4f7a7f903ee..f558770f845a 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -147,7 +147,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/aarch64-linux-gnu-gcc'\n\ ar =3D '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/aarch64-linux-gnu-strip'\n\ @@ -157,7 +157,7 @@ pkgconfig =3D '/usr/bin/aarch64-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'aarch64'\n\ cpu =3D 'aarch64'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu &&= \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c= ++ && \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/doc= ker/dockerfiles/debian-armel-cross.docker index 4b4191f82474..f3d7e07cce5a 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -146,7 +146,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabi-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabi-strip'\n\ @@ -156,7 +156,7 @@ pkgconfig =3D '/usr/bin/arm-linux-gnueabi-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'arm'\n\ cpu =3D 'arm'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi &&= \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c= ++ && \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index c9b6b2e56377..531c556ad5aa 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -147,7 +147,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/arm-linux-gnueabihf-gcc'\n\ ar =3D '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\ strip =3D '/usr/bin/arm-linux-gnueabihf-strip'\n\ @@ -157,7 +157,7 @@ pkgconfig =3D '/usr/bin/arm-linux-gnueabihf-pkg-config'= \n\ system =3D 'linux'\n\ cpu_family =3D 'arm'\n\ cpu =3D 'armhf'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf &&= \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf = && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -c++ && \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index cfe4f9a0d7fb..816dbd29113f 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -144,7 +144,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ ar =3D '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\ strip =3D '/usr/bin/mips64el-linux-gnuabi64-strip'\n\ @@ -154,7 +154,7 @@ pkgconfig =3D '/usr/bin/mips64el-linux-gnuabi64-pkg-con= fig'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips64'\n\ cpu =3D 'mips64el'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi6= 4 && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-c++ && \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index 8e521fc9eec9..b115b29af3d6 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -144,7 +144,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/mipsel-linux-gnu-gcc'\n\ ar =3D '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/mipsel-linux-gnu-strip'\n\ @@ -154,7 +154,7 @@ pkgconfig =3D '/usr/bin/mipsel-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 'mips'\n\ cpu =3D 'mipsel'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c+= + && \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index b1b8277f3f32..301bddb5367a 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -146,7 +146,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ ar =3D '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/powerpc64le-linux-gnu-strip'\n\ @@ -156,7 +156,7 @@ pkgconfig =3D '/usr/bin/powerpc64le-linux-gnu-pkg-confi= g'\n\ system =3D 'linux'\n\ cpu_family =3D 'ppc64'\n\ cpu =3D 'powerpc64le'\n\ -endian =3D 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu = && \ +endian =3D 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gn= u && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-c++ && \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index af39568ce53f..5d27c91c171a 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -145,7 +145,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ - echo "[binaries]\n\ + printf "[binaries]\n\ c =3D '/usr/bin/s390x-linux-gnu-gcc'\n\ ar =3D '/usr/bin/s390x-linux-gnu-gcc-ar'\n\ strip =3D '/usr/bin/s390x-linux-gnu-strip'\n\ @@ -155,7 +155,7 @@ pkgconfig =3D '/usr/bin/s390x-linux-gnu-pkg-config'\n\ system =3D 'linux'\n\ cpu_family =3D 's390x'\n\ cpu =3D 's390x'\n\ -endian =3D 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ +endian =3D 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++= && \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index 1fc4c987f751..e7966ec7fd28 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 =20 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/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 && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ @@ -50,7 +50,6 @@ exec "$@"' > /usr/bin/nosync && \ python3-pip \ python3-sphinx \ python3-sphinx_rtd_theme \ - rpm \ sed \ socat \ sparse \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 39a0617a9dcf..86c3a8f2ac04 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 =20 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/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 && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ @@ -50,7 +50,6 @@ exec "$@"' > /usr/bin/nosync && \ python3-pip \ python3-sphinx \ python3-sphinx_rtd_theme \ - rpm \ sed \ socat \ sparse \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index e030c5fb1e4a..b698b7595de1 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -7,14 +7,14 @@ FROM registry.fedoraproject.org/fedora:37 =20 RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/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 && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ @@ -110,7 +110,6 @@ exec "$@"' > /usr/bin/nosync && \ python3-sphinx \ python3-sphinx_rtd_theme \ rdma-core-devel \ - rpm \ sed \ snappy-devel \ socat \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 8e9500e44318..28f153b77b56 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -93,7 +93,6 @@ RUN zypper update -y && \ python39-pip \ python39-setuptools \ rdma-core-devel \ - rpm \ sed \ snappy-devel \ sndio-devel \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 232f41f160d4..2fa24dce8bc2 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 232f41f160d4567b8c82dd52aa96c2bc3a5b75c1 +Subproject commit 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae95 --=20 2.40.0 From nobody Tue May 14 16:39:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682066523; cv=none; d=zohomail.com; s=zohoarc; b=QGwD7K7J1JkdZHGaprwHZqayyq7D5g6EurueMmoW8fXHoZ9EwTuS+5a0HRZrh4yWwekztimS4RkUq+5RygU88rj9k+88YyVaHounMsObFDfWFLLlmkR5zVqX9pW9GA6X9DMP/T7Ejvt2Y863k2llz7qZn4zYPl9yg/vFQy+dD4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682066523; h=Content-Type:Content-Transfer-Encoding:Cc: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=HpiB6sxC3DohqxrKYpC94Jz3RHHqCyDuIsL7iXn2uv0=; b=Vq1aUTAWcQlM4hctvU9dodtaLrTWb0Z9OmoFohQut16a2Xe9eGhaFgg1d74R+U+9aYnrTk6VbuOjHXCdSbg4n7px2mHzfIVv6l/pS5V5v8+bFyhI4r1LdWqMeOb7Ecu5lx4a98Emj/vWMfkBGlyHoUCNz2BIsGkPP5JF1qR/hzg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682066523482128.40092467636896; Fri, 21 Apr 2023 01:42:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppmKX-00032w-N1; Fri, 21 Apr 2023 04:41:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppmKV-00032N-MM for qemu-devel@nongnu.org; Fri, 21 Apr 2023 04:41:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppmKK-0001sG-Ri for qemu-devel@nongnu.org; Fri, 21 Apr 2023 04:41:19 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-497-b4Fuyhx4MfeIDtAtBPt8ng-1; Fri, 21 Apr 2023 04:41:06 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-94a34e35f57so112369166b.3 for ; Fri, 21 Apr 2023 01:41:06 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id lh21-20020a170906f8d500b0094eeab34ad5sm1735202ejb.124.2023.04.21.01.41.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 01:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682066467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HpiB6sxC3DohqxrKYpC94Jz3RHHqCyDuIsL7iXn2uv0=; b=YEYs8BJdgHlCmfJs6YMq3pYXF4JBbynyg1lnH8gOYA03q8ExFcSdwzbhX6GW/TJYKDYeig f0ZkyCO1H9Gn4Fe7U7fI7kwwOmd+St8+0oqMNrFhGRUBUDgwfQmRKWwyqjEcQBy80QIVf8 49XMsG93UdfPCaRC/6L3/CMEDmUR7eE= X-MC-Unique: b4Fuyhx4MfeIDtAtBPt8ng-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682066464; x=1684658464; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HpiB6sxC3DohqxrKYpC94Jz3RHHqCyDuIsL7iXn2uv0=; b=FvTkCDIuX8JY/Y0Mq2RIzV8sg2k5QnZKOP/AbbnU3C2mR2RSWNh2BZr0KpWvfx8Zu6 DCW85/VEWJHYC7ZuZtqcWnQGb0ZUpusie6ENOzFgUhY9ApR/i8cGb0KYfABsdPS4wrjf f9zgkT66PSrBGyNgvBJV9UG2ZIxvxM6zrknhkwUVlUV4sIFk379fgYfKZSsQPkFZwrml 1YY86qwT3ii7gt9kfL4Z0638HxnrtLGnceayYOVhD6QonXQRPdNztSm5Sn+nlDY7wjzN J1X0+oTL4Dab3ZnrgAW4kVEm7C5p1pxw94WOEdSBy4DH/tEiCz54QMGEkOQEOinXH7Yb ossg== X-Gm-Message-State: AAQBX9fnp1scLPTbAvJh3Q9f07RCCHD1j0cqZ/eyRuHema7o+onej9dw slwt31VbbtMan865uMM8TtL/uigbJ06TPdUjf8NokyTMtaxnxY0rbe/Hhd2PnWxHf6Ldab3N+yx 0uJjQZdXoIxKbXqeLqYa3QHmEoFAf0efX3tEWcruL+IuxytCpQzqd6eRVhSxq5eWUfbqT7yggBl IxMw== X-Received: by 2002:a17:906:16d5:b0:94f:1c90:cb71 with SMTP id t21-20020a17090616d500b0094f1c90cb71mr1423796ejd.65.1682066464648; Fri, 21 Apr 2023 01:41:04 -0700 (PDT) X-Google-Smtp-Source: AKy350aB60kBMqTbNK/eTkWtgc4vaA8y+XGLfxAR/sT7kKcAYfMRVENfVGCHg6+yS76++hYUccXQSw== X-Received: by 2002:a17:906:16d5:b0:94f:1c90:cb71 with SMTP id t21-20020a17090616d500b0094f1c90cb71mr1423773ejd.65.1682066464280; Fri, 21 Apr 2023 01:41:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: pkrempa@redhat.com, berrange@redhat.com Subject: [PATCH v3 2/2] tests: lcitool: Switch to OpenSUSE Leap 15.4 Date: Fri, 21 Apr 2023 10:40:59 +0200 Message-Id: <20230421084059.9142-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421084059.9142-1-pbonzini@redhat.com> References: <20230421084059.9142-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682066525337100001 From: Peter Krempa Since OpenSUSE Leap 15 counts as a single major release of an LTS distribut= ion, lcitool has changed the target name to remove the minor version. Adjust the mappings and refresh script. This also updates the dockerfile to 15.4, since the 15.3 version is EOL now: https://get.opensuse.org/leap/15.3 Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: [Adjust for target name change and reword commit message. - Paolo] Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/opensuse-leap.docker | 4 +-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/mappings.yml | 36 +++++++++---------- tests/lcitool/refresh | 2 +- ...suse-leap-153.yml =3D> opensuse-leap-15.yml} | 0 5 files changed, 22 insertions(+), 22 deletions(-) rename tests/lcitool/targets/{opensuse-leap-153.yml =3D> opensuse-leap-15.= yml} (100%) diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 28f153b77b56..afb9f5419f5c 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all opensuse-leap-153 qemu +# $ lcitool dockerfile --layers all opensuse-leap-15 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM registry.opensuse.org/opensuse/leap:15.3 +FROM registry.opensuse.org/opensuse/leap:15.4 =20 RUN zypper update -y && \ zypper install -y \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 2fa24dce8bc2..85487e140415 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 2fa24dce8bc2d0d57b02b111dbdbd24e25d4ae95 +Subproject commit 85487e140415b2ac54b01a9a6b600fd7c21edc2f diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index e4719e45516c..454963f07b86 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -1,71 +1,71 @@ mappings: flake8: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 meson: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3: CentOSStream8: python38 - OpenSUSELeap153: python39-base + OpenSUSELeap15: python39-base =20 python3-PyYAML: CentOSStream8: python38-PyYAML - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-devel: CentOSStream8: python38-devel - OpenSUSELeap153: python39-devel + OpenSUSELeap15: python39-devel =20 python3-docutils: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-numpy: CentOSStream8: python38-numpy - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-opencv: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-pillow: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-pip: CentOSStream8: python38-pip - OpenSUSELeap153: python39-pip + OpenSUSELeap15: python39-pip =20 python3-pillow: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-selinux: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-setuptools: CentOSStream8: python38-setuptools - OpenSUSELeap153: python39-setuptools + OpenSUSELeap15: python39-setuptools =20 python3-sphinx: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-sphinx-rtd-theme: CentOSStream8: - OpenSUSELeap153: + OpenSUSELeap15: =20 python3-venv: CentOSStream8: python38 - OpenSUSELeap153: python39-base + OpenSUSELeap15: python39-base =20 python3-wheel: CentOSStream8: python38-wheel - OpenSUSELeap153: python39-pip + OpenSUSELeap15: python39-pip =20 pypi_mappings: # Request more recent version @@ -74,4 +74,4 @@ pypi_mappings: =20 # Drop packages that need devel headers python3-numpy: - OpenSUSELeap153: + OpenSUSELeap15: diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index c0d7ad551649..33ef1282dac4 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -120,7 +120,7 @@ try: generate_dockerfile("debian-amd64", "debian-11", trailer=3D"".join(debian11_extras)) generate_dockerfile("fedora", "fedora-37") - generate_dockerfile("opensuse-leap", "opensuse-leap-153") + generate_dockerfile("opensuse-leap", "opensuse-leap-15") generate_dockerfile("ubuntu2004", "ubuntu-2004") generate_dockerfile("ubuntu2204", "ubuntu-2204") =20 diff --git a/tests/lcitool/targets/opensuse-leap-153.yml b/tests/lcitool/ta= rgets/opensuse-leap-15.yml similarity index 100% rename from tests/lcitool/targets/opensuse-leap-153.yml rename to tests/lcitool/targets/opensuse-leap-15.yml --=20 2.40.0