From nobody Sat May 4 13:36:53 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 1525873843554108.04463853977063; Wed, 9 May 2018 06:50:43 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E38353247C1A; Wed, 9 May 2018 13:50:40 +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 8522961D3B; Wed, 9 May 2018 13:50:39 +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 34C364CAA1; Wed, 9 May 2018 13:50:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w49DoWPq027172 for ; Wed, 9 May 2018 09:50:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id B300F202329C; Wed, 9 May 2018 13:50:32 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56A6C2023298 for ; Wed, 9 May 2018 13:50:32 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 May 2018 15:50:28 +0200 Message-Id: <20180509135028.17122-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH] guests: Fix os_version for development branches 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.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 09 May 2018 13:50:42 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We currently know about three development branches: Fedora Rawhide, Debian sid and FreeBSD -CURRENT. For all three, we use the name of the development branch in the guest name; however, the value of os_version is not set consistently, making it awkward to create package mappings specific to these development branches. As an added bonus, this makes the code setting os_name and os_version more straightforward by simplifying conditionals and removing regexp-based string replacement. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/tasks/base.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index 70d5abc..9f27470 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -2,25 +2,33 @@ - name: Set additional facts (OS) set_fact: os_name: '{{ ansible_distribution }}' + +- name: Set additional facts (OS) + set_fact: os_version: '{{ ansible_distribution_major_version }}' when: - - ansible_distribution !=3D 'FreeBSD' - - ansible_distribution_release !=3D 'Rawhide' + - ansible_distribution_major_version is defined =20 - name: Set additional facts (OS) set_fact: - os_name: '{{ ansible_distribution }}' os_version: Rawhide when: - - ansible_distribution !=3D 'FreeBSD' + - os_name =3D=3D 'Fedora' - ansible_distribution_release =3D=3D 'Rawhide' =20 - name: Set additional facts (OS) set_fact: - os_name: '{{ ansible_distribution }}' - os_version: '{{ ansible_distribution_release|regex_replace("^(\d+)\.\d= +-.*$", "\1") }}' + os_version: Sid + when: + - os_name =3D=3D 'Debian' + - '{{ ansible_distribution_major_version|match("^.*/sid$") }}' + +- name: Set additional facts (OS) + set_fact: + os_version: Current when: - ansible_distribution =3D=3D 'FreeBSD' + - '{{ ansible_distribution_release|match("^.*-CURRENT$") }}' =20 - name: Set additional facts (package format) set_fact: --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list