From nobody Tue May 14 13:48:40 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=1644859510; cv=none; d=zohomail.com; s=zohoarc; b=T2/pTaMQp0crVDUxGMIGipYvsn/jI6DQ8yQ+mbXCPbcJJDxGw1EjTEkUMwufupyZeAqXgzuJJjxrY5P9xqqwxdlS9132N49idyK1AYSePFGoEimxmZIo1/S205ZDeOmC6kUFpm/ejIHj7mBgJ5m1vthEsO/XVAz4/4zZb3hltuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644859510; 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=QNnQtyQTc864qbBYkMSiJjc4/c5eIsXYNs9e+1Qg0no=; b=fZi8eE+Qe13NqeWgLAMauuFi+KmPPEv7BWS7Ci2cCJIvTVxIeJv3u8NO12zvadhyMH36DbIDyTuXCluywzQn0aMbjy+rwGdOO7tABwAy6KyIQ2O/aipeXrSN2r333PiSGtuCJXneslMoNO86S3cUd+q6Ji2DGd1R+Rr1vuIPMvs= 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 1644859510686996.9026231069097; Mon, 14 Feb 2022 09:25:10 -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-257-1a_MZJBPN66lpcDK9WMdNg-1; Mon, 14 Feb 2022 12:25:08 -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 796D51091DA2; Mon, 14 Feb 2022 17:25:02 +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 4AB337D4B0; Mon, 14 Feb 2022 17:25:02 +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 E16AD1809CB8; Mon, 14 Feb 2022 17:25:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21EHMbeW000327 for ; Mon, 14 Feb 2022 12:22:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id 580937D71E; Mon, 14 Feb 2022 17:22:37 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id BFB7D7D72C for ; Mon, 14 Feb 2022 17:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644859509; 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=QNnQtyQTc864qbBYkMSiJjc4/c5eIsXYNs9e+1Qg0no=; b=hB35FBmq122TcZSjrwhf7/b7rm6zDT9W9RnFVFiQ7IY6e7pkq7j7hPp5PMznHdrnQM7Bpo ahfkGkkI+BNWJQxj3n39D5YMvdAOJHC2/6HAomjxZNkm+2AQ9favv+xYfl9MHhEbBP83cz StYtsFv/hDiIqDSrbZzHkQgDqbN9jJg= X-MC-Unique: 1a_MZJBPN66lpcDK9WMdNg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/3] ci: Regenerate with new lcitool Date: Mon, 14 Feb 2022 18:22:16 +0100 Message-Id: <322aae06bf8c33aea532c5783bb634d207fe1298.1644859173.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1644859512532100001 Content-Type: text/plain; charset="utf-8" Re-generate our CI infra with 'lcitool' as of: commit b346752e98bd12395233ebba8c9312e08212b639 (HEAD) Author: Erik Skultety Date: Tue Feb 1 10:48:53 2022 +0100 tests: Replace CentOS 8 with AlmaLinux 8 in test scenarios Switch the test target before actually dropping CentOS 8. Signed-off-by: Erik Skultety This is prior to upstream lcitool dropping 'centos-8' support to minimize the differences. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/gitlab.yml | 58 ++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 03dee70480..48e6363c7c 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -395,9 +395,9 @@ x86_64-centos-8-clang: - x86_64-centos-8-container allow_failure: false variables: + CC: clang NAME: centos-8 RPM: skip - CC: clang x86_64-centos-stream-8: @@ -408,6 +408,7 @@ x86_64-centos-stream-8: variables: NAME: centos-stream-8 + x86_64-centos-stream-9: extends: .native_build_job needs: @@ -416,6 +417,7 @@ x86_64-centos-stream-9: variables: NAME: centos-stream-9 + x86_64-debian-10: extends: .native_build_job needs: @@ -485,8 +487,8 @@ x86_64-fedora-rawhide-clang: - x86_64-fedora-rawhide-container allow_failure: true variables: - NAME: fedora-rawhide CC: clang + NAME: fedora-rawhide RPM: skip @@ -525,9 +527,9 @@ x86_64-ubuntu-2004: - x86_64-ubuntu-2004-container allow_failure: false variables: - NAME: ubuntu-2004 ASAN_OPTIONS: verify_asan_link_order=3D0 MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined + NAME: ubuntu-2004 UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 @@ -537,9 +539,9 @@ x86_64-ubuntu-2004-clang: - x86_64-ubuntu-2004-container allow_failure: false variables: - NAME: ubuntu-2004 CC: clang MESON_ARGS: -Db_lundef=3Dfalse -Db_sanitize=3Daddress,undefined + NAME: ubuntu-2004 UBSAN_OPTIONS: print_stacktrace=3D1:halt_on_error=3D1 @@ -552,8 +554,8 @@ armv6l-debian-10: - armv6l-debian-10-container allow_failure: false variables: - NAME: debian-10 CROSS: armv6l + NAME: debian-10 mips-debian-10: @@ -562,8 +564,8 @@ mips-debian-10: - mips-debian-10-container allow_failure: false variables: - NAME: debian-10 CROSS: mips + NAME: debian-10 mipsel-debian-10: @@ -572,8 +574,8 @@ mipsel-debian-10: - mipsel-debian-10-container allow_failure: false variables: - NAME: debian-10 CROSS: mipsel + NAME: debian-10 armv7l-debian-11: @@ -582,8 +584,8 @@ armv7l-debian-11: - armv7l-debian-11-container allow_failure: false variables: - NAME: debian-11 CROSS: armv7l + NAME: debian-11 mips64el-debian-11: @@ -592,8 +594,8 @@ mips64el-debian-11: - mips64el-debian-11-container allow_failure: false variables: - NAME: debian-11 CROSS: mips64el + NAME: debian-11 ppc64le-debian-11: @@ -602,8 +604,8 @@ ppc64le-debian-11: - ppc64le-debian-11-container allow_failure: false variables: - NAME: debian-11 CROSS: ppc64le + NAME: debian-11 aarch64-debian-sid: @@ -612,8 +614,8 @@ aarch64-debian-sid: - aarch64-debian-sid-container allow_failure: true variables: - NAME: debian-sid CROSS: aarch64 + NAME: debian-sid i686-debian-sid: @@ -622,8 +624,8 @@ i686-debian-sid: - i686-debian-sid-container allow_failure: true variables: - NAME: debian-sid CROSS: i686 + NAME: debian-sid s390x-debian-sid: @@ -632,8 +634,8 @@ s390x-debian-sid: - s390x-debian-sid-container allow_failure: true variables: - NAME: debian-sid CROSS: s390x + NAME: debian-sid mingw64-fedora-35: @@ -642,8 +644,8 @@ mingw64-fedora-35: - mingw64-fedora-35-container allow_failure: false variables: - NAME: fedora-35 CROSS: mingw64 + NAME: fedora-35 mingw32-fedora-rawhide: @@ -652,8 +654,8 @@ mingw32-fedora-rawhide: - mingw32-fedora-rawhide-container allow_failure: true variables: - NAME: fedora-rawhide CROSS: mingw32 + NAME: fedora-rawhide # Native cirrus build jobs @@ -663,13 +665,13 @@ x86_64-freebsd-12: needs: [] allow_failure: false variables: - NAME: freebsd-12 - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-12-2 + CIRRUS_VM_IMAGE_SELECTOR: image_family + CIRRUS_VM_INSTANCE_TYPE: freebsd_instance + INSTALL_COMMAND: pkg install -y + NAME: freebsd-12 UPDATE_COMMAND: pkg update UPGRADE_COMMAND: pkg upgrade -y - INSTALL_COMMAND: pkg install -y x86_64-freebsd-13: @@ -677,13 +679,13 @@ x86_64-freebsd-13: needs: [] allow_failure: false variables: - NAME: freebsd-13 - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-13-0 + CIRRUS_VM_IMAGE_SELECTOR: image_family + CIRRUS_VM_INSTANCE_TYPE: freebsd_instance + INSTALL_COMMAND: pkg install -y + NAME: freebsd-13 UPDATE_COMMAND: pkg update UPGRADE_COMMAND: pkg upgrade -y - INSTALL_COMMAND: pkg install -y x86_64-macos-11: @@ -691,12 +693,12 @@ x86_64-macos-11: needs: [] allow_failure: false variables: - NAME: macos-11 - CIRRUS_VM_INSTANCE_TYPE: osx_instance - CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_IMAGE_NAME: big-sur-base - UPDATE_COMMAND: brew update - UPGRADE_COMMAND: brew upgrade + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_INSTANCE_TYPE: osx_instance INSTALL_COMMAND: brew install + NAME: macos-11 PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/= usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/= bin PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libp= cap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurs= es/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + UPDATE_COMMAND: brew update + UPGRADE_COMMAND: brew upgrade --=20 2.34.1 From nobody Tue May 14 13:48:40 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=1644859522; cv=none; d=zohomail.com; s=zohoarc; b=mnpqAesHn8m1hwmZdXGhARctSPODVGxLn5uYC4V/ErcNkdFsxJvgEPHL5VlHhH6t69oPXxbpUq+bYhS7R0Rl969vVk//lT//uBOSoozJtVToFru1RQHBKJ7tWMEpxK2m1dYIQMI3kwAKNC0xqyN7u44p9Fh21IlCnJaxjnUx0Ps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644859522; 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=1QTEWSgKPHb1WKdeNXTeZvENWWeNlSNd5ccd3p3Wm9s=; b=UsU2gwcmDEhWO7fDqnsj2N80NSxTcBu+hvOp5rw5/ZePeOuRHdpGffc77IJL8J2S+vxMpTSVeZg/DT7rBmfMEnRqpMXZ5ZBEHYP23LCNlM+QvlggndZObloEr7MR10urvBsCXR7CsAe2jOo6J8/yLdIK8XBiGfkXqS2drk/TIG8= 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 1644859522772108.37825713603661; Mon, 14 Feb 2022 09:25: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-561-1J8sZWnZMlqp07blOsr-fg-1; Mon, 14 Feb 2022 12:25:12 -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 6496E2F48; Mon, 14 Feb 2022 17:25:07 +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 44A5D7553F; Mon, 14 Feb 2022 17:25:07 +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 0E9F61809CBF; Mon, 14 Feb 2022 17:25:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21EHMslI000338 for ; Mon, 14 Feb 2022 12:22:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5096A7D716; Mon, 14 Feb 2022 17:22:54 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE8257D72E for ; Mon, 14 Feb 2022 17:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644859521; 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=1QTEWSgKPHb1WKdeNXTeZvENWWeNlSNd5ccd3p3Wm9s=; b=LtZTmXPcmN4Nx4B1HLUWNOhmYz7503S+KR7anwRqYjakT3kiiR1ReKPwIGjlTdFSVUALx2 +p4rjy0StcU47CgyQB4vYxFdOU7UOpaWRNTbyyrXL2GY+skMx1RcOn2z2mxNMzipMvndXC mzEkK31MwQBWtOyrg5q56y53sJKnxU4= X-MC-Unique: 1J8sZWnZMlqp07blOsr-fg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/3] ci: Move from 'centos-8' to 'almalinux-8' Date: Mon, 14 Feb 2022 18:22:17 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1644859524592100001 Content-Type: text/plain; charset="utf-8" Upstream lcitool suggests that as a solution to 'centos-8' being removed. Move also the website and other jobs to depend on 'x86_64-almalinux-8-container'. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.yml | 6 +++--- ...entos-8.Dockerfile =3D> almalinux-8.Dockerfile} | 2 +- ci/gitlab.yml | 16 ++++++++-------- ci/manifest.yml | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) rename ci/containers/{centos-8.Dockerfile =3D> almalinux-8.Dockerfile} (98= %) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ba11a0431..ec1b284da7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ website: stage: builds image: $CI_REGISTRY_IMAGE/ci-centos-8:latest needs: - - x86_64-centos-8-container + - x86_64-almalinux-8-container before_script: - *script_variables script: @@ -94,7 +94,7 @@ potfile: stage: builds image: $CI_REGISTRY_IMAGE/ci-centos-8:latest needs: - - x86_64-centos-8-container + - x86_64-almalinux-8-container rules: - if: "$CI_COMMIT_BRANCH =3D=3D 'master'" before_script: @@ -116,7 +116,7 @@ potfile: coverity: image: $CI_REGISTRY_IMAGE/ci-centos-8:latest needs: - - x86_64-centos-8-container + - x86_64-almalinux-8-container stage: builds script: - curl https://scan.coverity.com/download/linux64 --form project=3D$CO= VERITY_SCAN_PROJECT_NAME --form token=3D$COVERITY_SCAN_TOKEN -o /tmp/cov-an= alysis-linux64.tgz diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/almalinux-8.= Dockerfile similarity index 98% rename from ci/containers/centos-8.Dockerfile rename to ci/containers/almalinux-8.Dockerfile index f01ca6a0d9..55ce0908a3 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/almalinux-8.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/centos:8 +FROM docker.io/library/almalinux:8 RUN dnf update -y && \ dnf install 'dnf-command(config-manager)' -y && \ diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 48e6363c7c..cc03a2fe49 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -80,11 +80,11 @@ check-dco: # Native container jobs -x86_64-centos-8-container: +x86_64-almalinux-8-container: extends: .container_job allow_failure: false variables: - NAME: centos-8 + NAME: almalinux-8 x86_64-centos-stream-8-container: @@ -379,24 +379,24 @@ mingw64-fedora-rawhide-container: # Native build jobs -x86_64-centos-8: +x86_64-almalinux-8: extends: .native_build_job needs: - - x86_64-centos-8-container + - x86_64-almalinux-8-container allow_failure: false variables: - NAME: centos-8 + NAME: almalinux-8 RPM: skip -x86_64-centos-8-clang: +x86_64-almalinux-8-clang: extends: .native_build_job needs: - - x86_64-centos-8-container + - x86_64-almalinux-8-container allow_failure: false variables: CC: clang - NAME: centos-8 + NAME: almalinux-8 RPM: skip diff --git a/ci/manifest.yml b/ci/manifest.yml index 1cc589955c..87d923ae78 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -6,7 +6,7 @@ gitlab: project: libvirt targets: - centos-8: + almalinux-8: jobs: - arch: x86_64 variables: --=20 2.34.1 From nobody Tue May 14 13:48:40 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=1644859525; cv=none; d=zohomail.com; s=zohoarc; b=PDEOXscGRNFlRjY0Zpx6O5OjyjCZBuzGWQwX4+ywxofmzozlo8nqeQWN+l5UakSDaEjmSjADiacbHIiLsAKKl3oM2i0Ap+oXIMSNen87EgQXizVHEbLyI6ObwFnwDNLjmmpeWmVUwV2uuuLg/o1MGkKIusP6eF1PNZcGmKxET0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644859525; 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=0Xmns588Nd8ykeIGgFkARJ6VcwclX2GoBtQTyIxR9Qs=; b=I1EJ+XGzZuea4uxf4Snw6rSyrO7dQfH+W7i/Vs95Hrmy73SsN5ReGXERVPpLCcbPwpPU0rFXBpnWpxJEfffgrFQoPh8DrtOsbAZ3M1c8WK6Zp0shQLS3xFjYmW2Ae0DLBOVpPpzDb9j7/A2uZnoQsEDgI5DAYKg6DMpVZM6y5SU= 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 164485952525234.3132741806653; Mon, 14 Feb 2022 09:25:25 -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-252-0NTQaVgCNlmzx9HxagbpQw-1; Mon, 14 Feb 2022 12:25:15 -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 5DF41814266; Mon, 14 Feb 2022 17:25:10 +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 268557E914; Mon, 14 Feb 2022 17:25:10 +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 E087C1802E34; Mon, 14 Feb 2022 17:25:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21EHMt0j000346 for ; Mon, 14 Feb 2022 12:22:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6949F7D717; Mon, 14 Feb 2022 17:22:55 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id B11DA7D716 for ; Mon, 14 Feb 2022 17:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644859524; 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=0Xmns588Nd8ykeIGgFkARJ6VcwclX2GoBtQTyIxR9Qs=; b=a0FAYvbrnVl/D/4asfxfQdrjMglsX0HHYm/NSQOEGwf9KP5lklNqlo1oGZB599APo32/lN HbyRjDxo1Lrg0rGO4cBoHlqhEm5iqpaazETc/LhC3Gy+wumnpamguOxN8XAZ/FLSNVAyz2 BMycMOV39DZtsXaOwLg8YTqJSxIt6rY= X-MC-Unique: 0NTQaVgCNlmzx9HxagbpQw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/3] ci: Regenerate with new lcitool Date: Mon, 14 Feb 2022 18:22:18 +0100 Message-Id: <118822b31a06e48649f701210402d8fd8bb27651.1644859173.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: 1644859526659100001 Regenerate with lcitool as of: commit f83b916d5efa4bd33fbf4b7ea41bf6d535cc63fb Author: Alex Benn=C3=A9e Date: Fri Feb 11 09:39:30 2022 +0000 mappings: skip multipath-tools for cross Debian This package is both a mix of library files, headers and native binaries so cannot be installed in a cross environment. For now skip it for cross targets. See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D1005323 Signed-off-by: Alex Benn=C3=A9e Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/containers/centos-stream-9.Dockerfile | 3 +++ ci/containers/debian-10-cross-aarch64.Dockerfile | 3 +-- ci/containers/debian-10-cross-armv6l.Dockerfile | 3 +-- ci/containers/debian-10-cross-armv7l.Dockerfile | 3 +-- ci/containers/debian-10-cross-i686.Dockerfile | 3 +-- ci/containers/debian-10-cross-mips.Dockerfile | 3 +-- ci/containers/debian-10-cross-mips64el.Dockerfile | 3 +-- ci/containers/debian-10-cross-mipsel.Dockerfile | 3 +-- ci/containers/debian-10-cross-ppc64le.Dockerfile | 3 +-- ci/containers/debian-10-cross-s390x.Dockerfile | 3 +-- ci/containers/debian-10.Dockerfile | 3 +-- ci/containers/opensuse-leap-152.Dockerfile | 3 +-- ci/containers/ubuntu-1804.Dockerfile | 3 +-- ci/containers/ubuntu-2004.Dockerfile | 3 +-- 14 files changed, 16 insertions(+), 26 deletions(-) diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/cento= s-stream-9.Dockerfile index 4e2e10b078..d20602b847 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -9,6 +9,9 @@ FROM quay.io/centos/centos:stream9 RUN dnf update -y && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y crb && \ + dnf install -y \ + https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch= .rpm \ + https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.n= oarch.rpm && \ dnf install -y \ audit-libs-devel \ augeas \ diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containe= rs/debian-10-cross-aarch64.Dockerfile index 07994c1538..ca6b36b439 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/container= s/debian-10-cross-armv6l.Dockerfile index bef7bf74c2..6818d6c409 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/container= s/debian-10-cross-armv7l.Dockerfile index 9b6f2716e1..726d5d5846 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/= debian-10-cross-i686.Dockerfile index 1720d968b0..16e29e00c9 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/= debian-10-cross-mips.Dockerfile index f625ed3240..d5cabb47c4 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/contain= ers/debian-10-cross-mips64el.Dockerfile index e24aec9b6a..ff63c2b5da 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/container= s/debian-10-cross-mipsel.Dockerfile index 1af05e5184..93b68bd10e 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containe= rs/debian-10-cross-ppc64le.Dockerfile index bd2b921e9d..5577056754 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers= /debian-10-cross-s390x.Dockerfile index 8a8a3fc05b..886d532927 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.D= ockerfile index 41284a15db..63d070cb37 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -97,8 +97,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/ope= nsuse-leap-152.Dockerfile index d81bdea08e..864dfa4fa7 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -92,8 +92,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-18= 04.Dockerfile index 970d920310..5e9f90cdba 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -99,8 +99,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-20= 04.Dockerfile index 5cff997255..b6b10f2cbe 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -98,8 +98,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install \ - meson=3D=3D0.56.0 +RUN pip3 install meson=3D=3D0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" --=20 2.34.1