From nobody Mon Apr 29 20:46:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1575469422; cv=none; d=zohomail.com; s=zohoarc; b=cz4kcwziGsmTI7RZ/R7cXoKtejV/hfC7BPHSJvfqzcJ5xfEkbhN3T1VU16Ye+IizybJNn6M1Ifh5m7XWR+HIQEhZTPw+PACKeP0j/5IoN5tl9f7HPWNsYnsygF/4iHGz13NTe/xckna6cTZg5nUOOgLhGSIr5vIXJk1guGqtugM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575469422; 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=wLoNMywzKwBab6g4iF/s4pP/TuTyYw0UvHOMQ7UfI/M=; b=YXwC6JJYKtOzMiQWe8U/5rLnCKM7lhyMMzf8iMpbIWknlo7FQqZoTb2QLJsgTuwJD30rXpXxhCqPaVFZ4p5EH8BNqDEBu9jyBpngnrnNZtidB2EXKuYSZYAg7AOGfriL9nYsL4OyCT9ZB7Z14Qwt5k7lfC1xv367Vrca0P33h3A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1575469422892154.57206178672288; Wed, 4 Dec 2019 06:23:42 -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-347-ehAhrl_fMqGW945azt0fzQ-1; Wed, 04 Dec 2019 09:23:40 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C744ADB60; Wed, 4 Dec 2019 14:23:34 +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 9E9081001B23; Wed, 4 Dec 2019 14:23:34 +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 54CB318033C0; Wed, 4 Dec 2019 14:23:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB4ENXNJ008797 for ; Wed, 4 Dec 2019 09:23:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1CBB41001938; Wed, 4 Dec 2019 14:23:33 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (ovpn-205-23.brq.redhat.com [10.40.205.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31B15100EBA4 for ; Wed, 4 Dec 2019 14:23:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575469421; 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=wLoNMywzKwBab6g4iF/s4pP/TuTyYw0UvHOMQ7UfI/M=; b=dO9SUfw3mweDNchMnXykE/C4yQEnDCZvJm+uEanebH1Z46T6vWekbGV1go6J57tKr4YkBR jlBAzKzjVWrWyl1nTjagm2Q9EwIvavrZrY8iQ7xMm4aRJIFx8xQa4T0zxP/oa9tXL/To7V rOwfqN57ldskXnDItqcQ6DvgGw7nz50= From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 4 Dec 2019 15:23:25 +0100 Message-Id: <20191204142325.360367-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH] lcitool: Decouple Python interpreters for Ansible and builds 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.22 X-MC-Unique: ehAhrl_fMqGW945azt0fzQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We need to keep using Python 2 for Ansible, because Python 3 is only supported by the dnf module and on CentOS 7 we have to use the yum module instead; at the same time, all libvirt projects have now dropped Python 2 support so we need to make sure we use Python 3 for building them. Decouple the Python versions used for the two purposes so that we can keep everything working. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/playbooks/update/tasks/paths.yml | 2 ++ guests/playbooks/update/templates/bashrc.j2 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/guests/playbooks/update/tasks/paths.yml b/guests/playbooks/upd= ate/tasks/paths.yml index aada1f3..c204462 100644 --- a/guests/playbooks/update/tasks/paths.yml +++ b/guests/playbooks/update/tasks/paths.yml @@ -14,6 +14,7 @@ - make - ninja - ninja-build + - python3 - su =20 - name: 'Look for files' @@ -39,6 +40,7 @@ bash: '{{ commands["bash"] }}' ccache: '{{ commands["ccache"] }}' java: '{{ commands["java"] }}' + python: '{{ commands["python3"] }}' su: '{{ commands["su"] }}' sudoers: '{{ files["sudoers"] }}' =20 diff --git a/guests/playbooks/update/templates/bashrc.j2 b/guests/playbooks= /update/templates/bashrc.j2 index d3fc652..9cea90c 100644 --- a/guests/playbooks/update/templates/bashrc.j2 +++ b/guests/playbooks/update/templates/bashrc.j2 @@ -2,7 +2,7 @@ export PS1=3D"[\u@\h \w]\$ " =20 export MAKE=3D"{{ make }}" export NINJA=3D"{{ ninja }}" -export PYTHON=3D"{{ ansible_python_interpreter }}" +export PYTHON=3D"{{ python }}" =20 export MAKEFLAGS=3D"-j{{ install_vcpus|int + 1 }}" =20 --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list