From nobody Sat May 18 14:54:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1531472226601989.5349529579771; Fri, 13 Jul 2018 01:57:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8D1E30820E3; Fri, 13 Jul 2018 08:57:04 +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 B0A482010CC1; Fri, 13 Jul 2018 08:57:04 +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 4661118037ED; Fri, 13 Jul 2018 08:57:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6D8v29w021703 for ; Fri, 13 Jul 2018 04:57:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id A196D1C70A; Fri, 13 Jul 2018 08:57:02 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4260E1C67F for ; Fri, 13 Jul 2018 08:57:00 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 13 Jul 2018 10:56:56 +0200 Message-Id: <20180713085656.9554-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH] guests: Stop using search() as a filter 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 13 Jul 2018 08:57:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Recent versions of Ansible complain about this, and suggest to replace 'result|search' with 'result is search'. Since f17097c7af59, however, we've been including operating system information in the inventory: this allows us to drop our use of search() entirely. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- guests/tasks/bootstrap.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/guests/tasks/bootstrap.yml b/guests/tasks/bootstrap.yml index 24848c8..d7abb86 100644 --- a/guests/tasks/bootstrap.yml +++ b/guests/tasks/bootstrap.yml @@ -2,21 +2,19 @@ - name: Bootstrap the pkgng package manager raw: env ASSUME_ALWAYS_YES=3DYES pkg bootstrap when: - - inventory_hostname|search('freebsd') + - package_format =3D=3D 'pkg' =20 - name: Bootstrap Ansible raw: yum install -y python2 when: - - ( inventory_hostname|search('centos') or - inventory_hostname|search('fedora') ) + - package_format =3D=3D 'rpm' =20 - name: Bootstrap Ansible raw: apt-get install -y python when: - - ( inventory_hostname|search('debian') or - inventory_hostname|search('ubuntu') ) + - package_format =3D=3D 'deb' =20 - name: Bootstrap Ansible raw: pkg install -y python2 when: - - inventory_hostname|search('freebsd') + - package_format =3D=3D 'pkg' --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list