From nobody Tue Feb 10 04:15:12 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=1682588681; cv=none; d=zohomail.com; s=zohoarc; b=ndv3PKJbrZwt3ERzgC/Ze+X+RbHO7dJxDb+O+lenzrVJSX1oG5gxrWlRNhwJ9weUpHn79GFILwwFzjyoopOnQXl3JrVzNNCFhKzBNt/cN1+guiy1S5UDdmRAKl0vciCEpanFKFfQkP/q6FIgeJQ9qVYvLptdTrASjXC3zyJSy0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682588681; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=o7Whjohvo3hNSQ8fOKYSFjzdNBQjVarrLDWrG0he3BY=; b=CJljX4ZBhksp820tQuHkZrZh7IyjU/6saUnlw4XCyiLH2u52QaLCxD3wn07yzmgE0RWnmksXcJDcEOFdsAb/hzQLpAKKzRtBwC3B/wqiWIavundOpbRLOWpw/t/x8imXJXBAjs1h33CNoLehChPH1DF6Q0YopfOoy7JMEwMoZS8= 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 16825886814261014.2912990549404; Thu, 27 Apr 2023 02:44:41 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-650-vzEiVeLrMNOdYxrUsUzNdA-1; Thu, 27 Apr 2023 05:44:36 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7C39A10334A4; Thu, 27 Apr 2023 09:44:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 669D940C6EC4; Thu, 27 Apr 2023 09:44:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 33E271946A49; Thu, 27 Apr 2023 09:44:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 653F91946A45 for ; Thu, 27 Apr 2023 09:44:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E4FCB51E3; Thu, 27 Apr 2023 09:44:32 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C11E63F4C for ; Thu, 27 Apr 2023 09:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682588680; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=o7Whjohvo3hNSQ8fOKYSFjzdNBQjVarrLDWrG0he3BY=; b=OK2hwoU4FwEIa+EqWbfnj3w4fRXHJBzrjUQjnH2MF9+26ro7GXFCr3KxJ6cZ/W0EeXNliX 9rv7AZZivQCklh8jzwggVTV3sRDW3P+e7tKmenNYoKa/Tf1InD66L8Kfprr4BWUsMBYza+ l/+rowX96cgcXKqkLuos+N9hqMaR5H0= X-MC-Unique: vzEiVeLrMNOdYxrUsUzNdA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] ci: Regenerate files Date: Thu, 27 Apr 2023 11:44:30 +0200 Message-Id: <50700a75e751743cabd1adef65bd5a80044529f7.1682588670.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682588682611100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This removes minor version number from OpenSUSE LEAP target names and on CentOS Stream 9 installs flake8 from repositories, instead of pip. Signed-off-by: Michal Privoznik Reviewed-by: Pavel Hrdina --- ci/buildenv/centos-stream-9.sh | 5 +---- .../{opensuse-leap-154.sh =3D> opensuse-leap-15.sh} | 0 ci/containers/centos-stream-9.Dockerfile | 6 +----- ...leap-154.Dockerfile =3D> opensuse-leap-15.Dockerfile} | 0 ci/gitlab/builds.yml | 10 +++++----- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 7 files changed, 10 insertions(+), 17 deletions(-) rename ci/buildenv/{opensuse-leap-154.sh =3D> opensuse-leap-15.sh} (100%) rename ci/containers/{opensuse-leap-154.Dockerfile =3D> opensuse-leap-15.D= ockerfile} (100%) diff --git a/ci/buildenv/centos-stream-9.sh b/ci/buildenv/centos-stream-9.sh index 79d74d9b2b..454e1f6322 100644 --- a/ci/buildenv/centos-stream-9.sh +++ b/ci/buildenv/centos-stream-9.sh @@ -68,9 +68,7 @@ function install_buildenv() { polkit \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ + python3-flake8 \ qemu-img \ readline-devel \ rpcgen \ @@ -88,7 +86,6 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - /usr/bin/pip3 install flake8 } =20 export CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" diff --git a/ci/buildenv/opensuse-leap-154.sh b/ci/buildenv/opensuse-leap-1= 5.sh similarity index 100% rename from ci/buildenv/opensuse-leap-154.sh rename to ci/buildenv/opensuse-leap-15.sh diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/cento= s-stream-9.Dockerfile index 6478031379..47e9008b72 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -69,9 +69,7 @@ RUN dnf distro-sync -y && \ polkit \ python3 \ python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ + python3-flake8 \ qemu-img \ readline-devel \ rpcgen \ @@ -92,8 +90,6 @@ RUN dnf distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN /usr/bin/pip3 install flake8 - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/opensuse-leap-154.Dockerfile b/ci/containers/ope= nsuse-leap-15.Dockerfile similarity index 100% rename from ci/containers/opensuse-leap-154.Dockerfile rename to ci/containers/opensuse-leap-15.Dockerfile diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 545478d351..258d7a1da7 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -285,23 +285,23 @@ x86_64-fedora-rawhide-clang-local-env: RPM: skip =20 =20 -x86_64-opensuse-leap-154-prebuilt-env: +x86_64-opensuse-leap-15-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-opensuse-leap-154-container + - job: x86_64-opensuse-leap-15-container optional: true allow_failure: false variables: - NAME: opensuse-leap-154 + NAME: opensuse-leap-15 RPM: skip =20 -x86_64-opensuse-leap-154-local-env: +x86_64-opensuse-leap-15-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: IMAGE: registry.opensuse.org/opensuse/leap:15.4 - NAME: opensuse-leap-154 + NAME: opensuse-leap-15 RPM: skip =20 =20 diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 150df26519..5a02843ed9 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -77,11 +77,11 @@ x86_64-fedora-rawhide-container: NAME: fedora-rawhide =20 =20 -x86_64-opensuse-leap-154-container: +x86_64-opensuse-leap-15-container: extends: .container_job allow_failure: false variables: - NAME: opensuse-leap-154 + NAME: opensuse-leap-15 =20 =20 x86_64-opensuse-tumbleweed-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index b68c7361ab..82b8463605 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -160,7 +160,7 @@ targets: =20 freebsd-13: x86_64 =20 - opensuse-leap-154: + opensuse-leap-15: jobs: - arch: x86_64 variables: --=20 2.39.2