From nobody Fri Apr 26 20:50:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1610378841; cv=none; d=zohomail.com; s=zohoarc; b=AnDfDUnZW1pZDr0PLpmlZ96qz2Gy2UEUpqUptqd4+e9z+xI4p70ScGltgPQqXQTev08bPHydbgZmpaCJYuZdOj3nQ30hylhp7aJWnvQgGp0d6TCoMrCgRsMhtNWJDR7SCpqk7PXxr2+Ki5E16HwLDS5rcqMr9RA2qQybh15h4zM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610378841; 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=sV4M4Te+xL/xX2OQd+b8od1yEHjSCIl9M4FTvn84Etg=; b=nejWrH8zKbIFJeavlxSG+M7i+WLRCw4Jj7WIpG4JJPCrsdSsfWjEnJe4ncDV2twa14nD99Od3QGrswq6+vYh4e1LGOmCxbeASj26FQRquHboJSE/OLIUxpCfxFIwWumkhasdFzFhiUWdzF5XdPeJAkNG8z1/ecqM5E3672oKEpA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1610378841702565.6115012287494; Mon, 11 Jan 2021 07:27:21 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-68-l6rtADkwMtiqtuYORvOG3Q-1; Mon, 11 Jan 2021 10:27:17 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2E608CE646; Mon, 11 Jan 2021 15:27:12 +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 047695D6BA; Mon, 11 Jan 2021 15:27:12 +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 C134C4EBC6; Mon, 11 Jan 2021 15:27:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10BFR5Do016470 for ; Mon, 11 Jan 2021 10:27:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id 02EE45D762; Mon, 11 Jan 2021 15:27:05 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-108.ams2.redhat.com [10.36.115.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 438095D6BA; Mon, 11 Jan 2021 15:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610378840; 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=sV4M4Te+xL/xX2OQd+b8od1yEHjSCIl9M4FTvn84Etg=; b=TA04h4anVw+7sE0PKm64jFX2DTOl2fc4hKrIwQ72m8W0g8RCOjy/bScQZiissDVOi03sWn qD0i6G+Cgcep2JudaRUlM3vASF360AD5yQEFR49nvtIz9JhLS8L8MXtsGV4RE3ck/BaL63 fPpjJUqCFU8drphwU5s7YFsMiUqZ0Ao= X-MC-Unique: l6rtADkwMtiqtuYORvOG3Q-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] ci: rename the cirrus vars file to remove the "libvirt-" prefix Date: Mon, 11 Jan 2021 15:27:00 +0000 Message-Id: <20210111152701.1216690-2-berrange@redhat.com> In-Reply-To: <20210111152701.1216690-1-berrange@redhat.com> References: <20210111152701.1216690-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.15 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) The "libvirt-" prefix was removed from hostnames in libvirt-ci. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- .gitlab-ci.yml | 2 +- ci/cirrus/{libvirt-freebsd-11.vars =3D> freebsd-11.vars} | 0 ci/cirrus/{libvirt-freebsd-12.vars =3D> freebsd-12.vars} | 0 ci/cirrus/{libvirt-macos-1015.vars =3D> macos-1015.vars} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename ci/cirrus/{libvirt-freebsd-11.vars =3D> freebsd-11.vars} (100%) rename ci/cirrus/{libvirt-freebsd-12.vars =3D> freebsd-12.vars} (100%) rename ci/cirrus/{libvirt-macos-1015.vars =3D> macos-1015.vars} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2d5545f0f..b893b285b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ stages: image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master needs: [] script: - - source ci/cirrus/libvirt-$NAME.vars + - source ci/cirrus/$NAME.vars - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g" -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g" -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g" diff --git a/ci/cirrus/libvirt-freebsd-11.vars b/ci/cirrus/freebsd-11.vars similarity index 100% rename from ci/cirrus/libvirt-freebsd-11.vars rename to ci/cirrus/freebsd-11.vars diff --git a/ci/cirrus/libvirt-freebsd-12.vars b/ci/cirrus/freebsd-12.vars similarity index 100% rename from ci/cirrus/libvirt-freebsd-12.vars rename to ci/cirrus/freebsd-12.vars diff --git a/ci/cirrus/libvirt-macos-1015.vars b/ci/cirrus/macos-1015.vars similarity index 100% rename from ci/cirrus/libvirt-macos-1015.vars rename to ci/cirrus/macos-1015.vars --=20 2.29.2 From nobody Fri Apr 26 20:50:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1610378886; cv=none; d=zohomail.com; s=zohoarc; b=LHjPgbJRu7KiYBQO/si6Xitv8Drwwfh0yK/oowDWpsoFWfDGJ+PIqh4lGHMQ2WiCIsrzh7AyfS3CbmAbzbJcHvlDVYApKjn7q7INqpvZX2tDxuQmQp13QeMb5ejv/pyZub3bczZTdP6N1s9QcmAR+Tfqi0Ic5WI3TKSZzXKoR2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610378886; 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=Ep+RPUMJkRJsS6oFKbMyzm2xdIbn/PQdQ9rSEAaOk78=; b=Fu4iSSHtBkYWvKPVI4pbeaYdx3qJq/qqA1bi+eeUd0PQEOpW1fxvUEE7TFIYKo1wDMJEn4tdVd7UmCkuYihzFSa0T7c/YzzU9QqvYKD5lUfrd4m6xKN6fBxtdlR+F/VNa2gCIknwZKbWuR9so/ggER33ny6Q1fW0bLE66ERX2Dk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1610378886599476.2665201162408; Mon, 11 Jan 2021 07:28:06 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-o5mTtRxGPum2_tYl4jH7hw-1; Mon, 11 Jan 2021 10:27:22 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A28D38031FE; Mon, 11 Jan 2021 15:27:15 +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 7F7525D6BA; Mon, 11 Jan 2021 15:27:15 +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 471AC180954D; Mon, 11 Jan 2021 15:27:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10BFR6lU016480 for ; Mon, 11 Jan 2021 10:27:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5E7AB5D762; Mon, 11 Jan 2021 15:27:06 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-108.ams2.redhat.com [10.36.115.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59E175D6D5; Mon, 11 Jan 2021 15:27:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610378885; 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=Ep+RPUMJkRJsS6oFKbMyzm2xdIbn/PQdQ9rSEAaOk78=; b=BuARDYVxEe3wGOf5Fq4SRkq2rXV95Y5OhL8Y5SsEeC/7YO0r/FcWvK1gnqycd0vF0rVIqH uX7BsYbLs1COhofxpzqfWOh4+9PISw5RmxPpR4JgscO7odaPCpT2EGEGpoAyW0T5SQACFw 0Yhy6ow1GgKMBqZpUXk10SDb6Tvmt1k= X-MC-Unique: o5mTtRxGPum2_tYl4jH7hw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] ci: refresh cirrus vars files Date: Mon, 11 Jan 2021 15:27:01 +0000 Message-Id: <20210111152701.1216690-3-berrange@redhat.com> In-Reply-To: <20210111152701.1216690-1-berrange@redhat.com> References: <20210111152701.1216690-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.15 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) In this refresh the PIP variable is renamed to PIP3 and the PYPI_PKGS variable disappears since we (currently) don't have any need for it. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- .gitlab-ci.yml | 2 +- ci/cirrus/build.yml | 2 +- ci/cirrus/freebsd-11.vars | 5 ++--- ci/cirrus/freebsd-12.vars | 5 ++--- ci/cirrus/freebsd-current.vars | 8 ++++++++ ci/cirrus/macos-1015.vars | 5 ++--- ci/cirrus/refresh | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 ci/cirrus/freebsd-current.vars diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b893b285b5..2171905f8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ stages: -e "s|[@]PKGS@|$PKGS|g" -e "s|[@]MAKE@|$MAKE|g" -e "s|[@]PYTHON@|$PYTHON|g" - -e "s|[@]PIP@|$PIP|g" + -e "s|[@]PIP3@|$PIP3|g" -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" ci/cirrus/$NAME.yml - cat ci/cirrus/$NAME.yml diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index dc1cccd135..3ca88b265b 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -13,7 +13,7 @@ env: build_task: install_script: - @INSTALL_COMMAND@ @PKGS@ - - @PIP@ install @PYPI_PKGS@ + - if test -n "@PYPI_PKGS@" ; then @PIP3@ install @PYPI_PKGS@ ; fi clone_script: - git clone --depth 100 "$CI_REPOSITORY_URL" . - git fetch origin "$CI_COMMIT_REF_NAME" diff --git a/ci/cirrus/freebsd-11.vars b/ci/cirrus/freebsd-11.vars index 7c29c6f899..5add0fb058 100644 --- a/ci/cirrus/freebsd-11.vars +++ b/ci/cirrus/freebsd-11.vars @@ -4,6 +4,5 @@ CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' -PIP=3D'/usr/local/bin/pip-3.7' -PKGS=3D'augeas autoconf automake avahi bash bash-completion ca_root_nss cc= ache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb get= text gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh li= bssh2 libtool libxml2 libxslt lsof ncurses ninja p5-App-cpanminus patch per= l5 pkgconf polkit py37-docutils py37-flake8 py37-pip py37-setuptools py37-w= heel python3 qemu-utils radvd readline screen sudo vim yajl' -PYPI_PKGS=3D'meson=3D=3D0.54.0' +PIP3=3D'/usr/local/bin/pip-3.7' +PKGS=3D'augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sa= sl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnut= ls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl= 5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 7c29c6f899..5add0fb058 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -4,6 +4,5 @@ CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' -PIP=3D'/usr/local/bin/pip-3.7' -PKGS=3D'augeas autoconf automake avahi bash bash-completion ca_root_nss cc= ache chrony cppi curl cyrus-sasl dbus diskscrub dnsmasq fusefs-libs gdb get= text gettext-tools git glib gmake gnutls hal libpcap libpciaccess libssh li= bssh2 libtool libxml2 libxslt lsof ncurses ninja p5-App-cpanminus patch per= l5 pkgconf polkit py37-docutils py37-flake8 py37-pip py37-setuptools py37-w= heel python3 qemu-utils radvd readline screen sudo vim yajl' -PYPI_PKGS=3D'meson=3D=3D0.54.0' +PIP3=3D'/usr/local/bin/pip-3.7' +PKGS=3D'augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sa= sl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnut= ls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl= 5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars new file mode 100644 index 0000000000..5add0fb058 --- /dev/null +++ b/ci/cirrus/freebsd-current.vars @@ -0,0 +1,8 @@ +PACKAGING_COMMAND=3D'pkg' +CC=3D'/usr/bin/clang' +CCACHE=3D'/usr/local/bin/ccache' +MAKE=3D'/usr/local/bin/gmake' +NINJA=3D'/usr/local/bin/ninja' +PYTHON=3D'/usr/local/bin/python3' +PIP3=3D'/usr/local/bin/pip-3.7' +PKGS=3D'augeas avahi bash-completion ca_root_nss ccache cppi curl cyrus-sa= sl dbus diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnut= ls hal libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl= 5 pkgconf polkit py37-docutils py37-flake8 python3 qemu radvd readline yajl' diff --git a/ci/cirrus/macos-1015.vars b/ci/cirrus/macos-1015.vars index 7704d747df..c29b8b13b8 100644 --- a/ci/cirrus/macos-1015.vars +++ b/ci/cirrus/macos-1015.vars @@ -4,6 +4,5 @@ CCACHE=3D'/usr/local/bin/ccache' MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PYTHON=3D'/usr/local/bin/python3' -PIP=3D'/usr/local/bin/pip3' -PKGS=3D'augeas autoconf automake bash bash-completion ccache cpanminus cpp= i curl dbus dnsmasq docutils flake8 gdb gettext git glib gnutls gpatch libi= scsi libpcap libssh libssh2 libtool libxml2 libxslt lsof make ncurses ninja= perl pkg-config python3 qemu readline rpcgen screen scrub vim xz yajl' -PYPI_PKGS=3D'meson=3D=3D0.54.0' +PIP3=3D'/usr/local/bin/pip3' +PKGS=3D'augeas bash-completion ccache cppi curl dbus diffutils dnsmasq doc= utils flake8 gettext git glib gnutls libiscsi libpcap libssh libssh2 libxml= 2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scr= ub yajl' diff --git a/ci/cirrus/refresh b/ci/cirrus/refresh index 3a178909f8..63ca794134 100755 --- a/ci/cirrus/refresh +++ b/ci/cirrus/refresh @@ -14,7 +14,7 @@ then exit 1 fi =20 -HOSTS=3D$($LCITOOL hosts | grep -E 'freebsd-12|macos') +HOSTS=3D$($LCITOOL hosts | grep -E 'freebsd|macos') =20 for host in $HOSTS do --=20 2.29.2