From nobody Tue May 7 14:31:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1575466018; cv=none; d=zohomail.com; s=zohoarc; b=nF8gdIuEmqgLxZj1WWh/qpByZnRlnCW6L8PGhsBBLIW+KZRRtXXnokF10VNK1F3vHJCCYuQ0+gCP0oEaHC5Z7t+1HrnHtNgFt8A/2or/VIQ/nSfW+TFWjhHDGYlM7ElQ23pfwLOsBDEgVwzmNj8ro+gYH+e+hnJ2BZe8/Dxhm/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575466018; 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=0ywg+QnpceZxs5VX8OcSA8IBY1W8z/1d7mMnfkyeeYE=; b=UMosj7JrBmDxY0y2ph9abVWzNamt634R6oGdUdb1ffB87fG9xG/n4Gr8iZ4taBSm0OhpvTisj8i7aQ61c4hOsQNkRlwvKK8vbV105Cw6D10s7++xydEXaQh6UkAn2nmgycTeaqHnW9oWt2HrLg7AsffmCtmSZNDUazzAo3Y/pBY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1575466018822813.9673723072116; Wed, 4 Dec 2019 05:26:58 -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-436-qIYbRVpSN7uKT63O7HXr2w-1; Wed, 04 Dec 2019 08:26:55 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2B115107ACC7; Wed, 4 Dec 2019 13:26:50 +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 8C0DC19C6A; Wed, 4 Dec 2019 13:26:49 +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 7D46018089C8; Wed, 4 Dec 2019 13:26:48 +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 xB4DQkPi003895 for ; Wed, 4 Dec 2019 08:26:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id E0DF4691A4; Wed, 4 Dec 2019 13:26:46 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 197FB6BF60; Wed, 4 Dec 2019 13:26:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575466017; 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=0ywg+QnpceZxs5VX8OcSA8IBY1W8z/1d7mMnfkyeeYE=; b=c13eJTugePC55PqotGRvue+53zJxFb6AaiLK6S7WPAfdhGEiAggwUfGJM6VA3q+8mPoCGQ V6pGRDOgAZUrDo6zuo511cYI803O0wF0KEmNAGTlfjnAMheHuwK5cjQX0Z2J8FTX7BB6eb S4ndbqTJGA4fwohPIdTfRYODVqfRmlQ= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 4 Dec 2019 13:26:36 +0000 Message-Id: <20191204132636.2822757-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH] Drop support for python 2 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.84 on 10.5.11.23 X-MC-Unique: qIYbRVpSN7uKT63O7HXr2w-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) CentOS7 now has support for python 3 out of the box Signed-off-by: Daniel P. Berrang=C3=A9 --- guests/host_vars/libvirt-centos-7/main.yml | 2 -- guests/playbooks/update/tasks/bootstrap.yml | 6 ------ guests/vars/mappings.yml | 24 --------------------- guests/vars/projects/base.yml | 1 - guests/vars/projects/libvirt-python.yml | 4 ---- 5 files changed, 37 deletions(-) diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/= libvirt-centos-7/main.yml index 94e29af..d730aa2 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -16,5 +16,3 @@ package_format: 'rpm' package_manager: 'yum' os_name: 'CentOS' os_version: '7' - -ansible_python_interpreter: /usr/bin/python2 diff --git a/guests/playbooks/update/tasks/bootstrap.yml b/guests/playbooks= /update/tasks/bootstrap.yml index 2e1dc42..c77d3a1 100644 --- a/guests/playbooks/update/tasks/bootstrap.yml +++ b/guests/playbooks/update/tasks/bootstrap.yml @@ -7,11 +7,5 @@ - set_fact: python: python3 =20 -- set_fact: - python: python2 - when: - - os_name =3D=3D 'CentOS' - - os_version =3D=3D '7' - - name: Bootstrap Ansible raw: '{{ package_manager }} install -y {{ python }}' diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 9c339f2..ce1294c 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -804,30 +804,6 @@ mappings: CentOS7: python36-docutils FreeBSD: py36-docutils =20 - python2: - default: python - Fedora: python2 - FreeBSD: python2 - - python2-devel: - deb: python-dev - pkg: python2 - rpm: python2-devel - cross-policy-deb: foreign - - python2-lxml: - default: python-lxml - Fedora: python2-lxml - FreeBSD: py27-lxml - - python2-nose: - default: python-nose - Fedora: python2-nose - FreeBSD: py27-nose - - python2-setuptools: - CentOS7: python2-setuptools - python3: default: python3 =20 diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index 275211c..29c10b4 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -25,7 +25,6 @@ packages: - patch - perl - pkg-config - - python2-setuptools - python3 - python3-pip - python3-setuptools diff --git a/guests/vars/projects/libvirt-python.yml b/guests/vars/projects= /libvirt-python.yml index 86b5aab..71a0717 100644 --- a/guests/vars/projects/libvirt-python.yml +++ b/guests/vars/projects/libvirt-python.yml @@ -1,9 +1,5 @@ --- packages: - - python2 - - python2-devel - - python2-lxml - - python2-nose - python3-devel - python3-lxml - python3-nose --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list