From nobody Sat Apr 27 08:20:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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=1575901496; cv=none; d=zohomail.com; s=zohoarc; b=dYOSDLfa9ZN0VYzMPqqOEOSpHQ4T6c8PQhT11n75oIUt4XzUF7t77TeXN3d8jPs9uC+BAauOV+cAeaRRyCRVDBrE+85grxhOXIrwDZLMEvZ4B10r+ino9HfC+TD4eNSbZNoSp1i/u3bdrV6f4MPsi46WDUq/j1+7SDK4IOOjdlY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575901496; 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=5GdXSbaURx8hvnlKkv3Yn6/EFfwPB8WJ4Qoe1TKmq4s=; b=fU57IGXIliFi2yvpSiHvA1/qzAZghW+eQD7WwjF/FFBMiUCtn9/dm7M2hWZofHv1n4Vn21pg0CiGDy0MvsDvq0diqX8vl1e+rM0KKN3NdluamXQdfzFCChfWjq9oUjUdRx0NH5yY+UYYyN5AZ66GiCxDW0n3nl8GzQu43V/n0sQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 157590149655033.86690151941616; Mon, 9 Dec 2019 06:24:56 -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-227-C6BWtyC9NwqSaJJV6j6t3g-1; Mon, 09 Dec 2019 09:24:53 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CD0851005512; Mon, 9 Dec 2019 14:24:47 +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 7AC5460BE0; Mon, 9 Dec 2019 14:24:47 +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 98E1B83553; Mon, 9 Dec 2019 14:24:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB9EOjeQ029927 for ; Mon, 9 Dec 2019 09:24:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id 09C7360C05; Mon, 9 Dec 2019 14:24:45 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (ovpn-205-153.brq.redhat.com [10.40.205.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3616960BE0 for ; Mon, 9 Dec 2019 14:24:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575901495; 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=5GdXSbaURx8hvnlKkv3Yn6/EFfwPB8WJ4Qoe1TKmq4s=; b=DvmMqr8ALRcrqcZdjJ25N7pQTfXr+ZtYQMIECXWT/js6cxbJNungRh0HjKHHfQQo+svCkO pGcFl9v/OmTAlfn/zCyMOg4qPB1PCMQfymTFNU0rCg3LSbr3iD6Rt2aOrJ3cgS5S5Tul6/ uAawLvdV31LRnaam0ZjLn3A4CoVGhpo= From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 9 Dec 2019 15:24:36 +0100 Message-Id: <20191209142436.17369-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH] guests: Rename Ubuntu targets 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.12 X-MC-Unique: C6BWtyC9NwqSaJJV6j6t3g-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" Back when they were introduced, we chose to only include the part of the version number preceding the dot with the rationale that doing so introduced no ambiguity since, while there are two Ubuntu releases per year, we only support LTS releases and those happen once every two years. When introducing openSUSE support, however, we could not adopt the same strategy because openSUSE Leap 15.0 and openSUSe Leap 15.1 are, at least in some regards, just as distinct as Ubuntu 16.04 and Ubuntu 18.04 are, despite sharing the same major version number; we've thus decided to encode the full version number, dropping the dot to avoid issues connected to the fact that we use the target name as host name for guests. Let's retroactively apply this new convention to existing Ubuntu targets in order to maintain consistency. Signed-off-by: Andrea Bolognani Reviewed-by: Fabiano Fid=C3=AAncio --- .../docker.yml | 0 .../install.yml | 0 .../main.yml | 2 +- .../docker.yml | 0 .../install.yml | 0 .../main.yml | 2 +- guests/inventory | 4 ++-- guests/playbooks/build/jobs/defaults.yml | 4 ++-- .../playbooks/build/projects/libvirt-dbus.yml | 2 +- .../build/projects/libvirt-go-xml.yml | 4 ++-- .../playbooks/build/projects/libvirt-go.yml | 4 ++-- .../build/projects/libvirt-sandbox.yml | 4 ++-- .../playbooks/build/projects/libvirt-tck.yml | 4 ++-- guests/playbooks/build/projects/libvirt.yml | 4 ++-- .../playbooks/build/projects/virt-manager.yml | 4 ++-- guests/vars/mappings.yml | 22 +++++++++---------- 16 files changed, 30 insertions(+), 30 deletions(-) rename guests/host_vars/{libvirt-ubuntu-16 =3D> libvirt-ubuntu-1604}/docke= r.yml (100%) rename guests/host_vars/{libvirt-ubuntu-16 =3D> libvirt-ubuntu-1604}/insta= ll.yml (100%) rename guests/host_vars/{libvirt-ubuntu-16 =3D> libvirt-ubuntu-1604}/main.= yml (95%) rename guests/host_vars/{libvirt-ubuntu-18 =3D> libvirt-ubuntu-1804}/docke= r.yml (100%) rename guests/host_vars/{libvirt-ubuntu-18 =3D> libvirt-ubuntu-1804}/insta= ll.yml (100%) rename guests/host_vars/{libvirt-ubuntu-18 =3D> libvirt-ubuntu-1804}/main.= yml (95%) diff --git a/guests/host_vars/libvirt-ubuntu-16/docker.yml b/guests/host_va= rs/libvirt-ubuntu-1604/docker.yml similarity index 100% rename from guests/host_vars/libvirt-ubuntu-16/docker.yml rename to guests/host_vars/libvirt-ubuntu-1604/docker.yml diff --git a/guests/host_vars/libvirt-ubuntu-16/install.yml b/guests/host_v= ars/libvirt-ubuntu-1604/install.yml similarity index 100% rename from guests/host_vars/libvirt-ubuntu-16/install.yml rename to guests/host_vars/libvirt-ubuntu-1604/install.yml diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars= /libvirt-ubuntu-1604/main.yml similarity index 95% rename from guests/host_vars/libvirt-ubuntu-16/main.yml rename to guests/host_vars/libvirt-ubuntu-1604/main.yml index 179dd03..4f803a5 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-1604/main.yml @@ -18,6 +18,6 @@ projects: package_format: 'deb' package_manager: 'apt-get' os_name: 'Ubuntu' -os_version: '16' +os_version: '1604' =20 ansible_python_interpreter: /usr/bin/python3 diff --git a/guests/host_vars/libvirt-ubuntu-18/docker.yml b/guests/host_va= rs/libvirt-ubuntu-1804/docker.yml similarity index 100% rename from guests/host_vars/libvirt-ubuntu-18/docker.yml rename to guests/host_vars/libvirt-ubuntu-1804/docker.yml diff --git a/guests/host_vars/libvirt-ubuntu-18/install.yml b/guests/host_v= ars/libvirt-ubuntu-1804/install.yml similarity index 100% rename from guests/host_vars/libvirt-ubuntu-18/install.yml rename to guests/host_vars/libvirt-ubuntu-1804/install.yml diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars= /libvirt-ubuntu-1804/main.yml similarity index 95% rename from guests/host_vars/libvirt-ubuntu-18/main.yml rename to guests/host_vars/libvirt-ubuntu-1804/main.yml index 5b5bf0c..9070157 100644 --- a/guests/host_vars/libvirt-ubuntu-18/main.yml +++ b/guests/host_vars/libvirt-ubuntu-1804/main.yml @@ -19,6 +19,6 @@ projects: package_format: 'deb' package_manager: 'apt-get' os_name: 'Ubuntu' -os_version: '18' +os_version: '1804' =20 ansible_python_interpreter: /usr/bin/python3 diff --git a/guests/inventory b/guests/inventory index f1f7708..ecdcc34 100644 --- a/guests/inventory +++ b/guests/inventory @@ -9,5 +9,5 @@ libvirt-freebsd-11 libvirt-freebsd-12 libvirt-freebsd-current libvirt-opensuse-151 -libvirt-ubuntu-16 -libvirt-ubuntu-18 +libvirt-ubuntu-1604 +libvirt-ubuntu-1804 diff --git a/guests/playbooks/build/jobs/defaults.yml b/guests/playbooks/bu= ild/jobs/defaults.yml index 43ab882..0175a05 100644 --- a/guests/playbooks/build/jobs/defaults.yml +++ b/guests/playbooks/build/jobs/defaults.yml @@ -11,8 +11,8 @@ all_machines: - libvirt-freebsd-12 - libvirt-freebsd-current - libvirt-opensuse-151 - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 rpm_machines: - libvirt-centos-7 - libvirt-fedora-30 diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/play= books/build/projects/libvirt-dbus.yml index fac1d8f..8c946af 100644 --- a/guests/playbooks/build/projects/libvirt-dbus.yml +++ b/guests/playbooks/build/projects/libvirt-dbus.yml @@ -19,7 +19,7 @@ - libvirt-debian-sid - libvirt-fedora-30 - libvirt-fedora-rawhide - - libvirt-ubuntu-18 + - libvirt-ubuntu-1804 - include: '{{ playbook_base }}/jobs/meson-rpm-job.yml' vars: # RPM build is still not possible on CentOS7 as it does not diff --git a/guests/playbooks/build/projects/libvirt-go-xml.yml b/guests/pl= aybooks/build/projects/libvirt-go-xml.yml index f96df60..5cacb7c 100644 --- a/guests/playbooks/build/projects/libvirt-go-xml.yml +++ b/guests/playbooks/build/projects/libvirt-go-xml.yml @@ -11,8 +11,8 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["libvirt-go-xml"][git_remote] }}' =20 diff --git a/guests/playbooks/build/projects/libvirt-go.yml b/guests/playbo= oks/build/projects/libvirt-go.yml index 654190c..36322b1 100644 --- a/guests/playbooks/build/projects/libvirt-go.yml +++ b/guests/playbooks/build/projects/libvirt-go.yml @@ -11,8 +11,8 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["libvirt-go"][git_remote] }}' =20 diff --git a/guests/playbooks/build/projects/libvirt-sandbox.yml b/guests/p= laybooks/build/projects/libvirt-sandbox.yml index ec72051..0b4fe50 100644 --- a/guests/playbooks/build/projects/libvirt-sandbox.yml +++ b/guests/playbooks/build/projects/libvirt-sandbox.yml @@ -11,8 +11,8 @@ - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["libvirt-sandbox"][git_remote] }}' =20 diff --git a/guests/playbooks/build/projects/libvirt-tck.yml b/guests/playb= ooks/build/projects/libvirt-tck.yml index 9d885c1..ef88cd3 100644 --- a/guests/playbooks/build/projects/libvirt-tck.yml +++ b/guests/playbooks/build/projects/libvirt-tck.yml @@ -11,8 +11,8 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["libvirt-tck"][git_remote] }}' =20 diff --git a/guests/playbooks/build/projects/libvirt.yml b/guests/playbooks= /build/projects/libvirt.yml index 66ea851..e0f2f7c 100644 --- a/guests/playbooks/build/projects/libvirt.yml +++ b/guests/playbooks/build/projects/libvirt.yml @@ -20,8 +20,8 @@ - libvirt-fedora-31 - libvirt-fedora-rawhide - libvirt-opensuse-151 - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 + - libvirt-ubuntu-1604 + - libvirt-ubuntu-1804 - include: '{{ playbook_base }}/jobs/autotools-check-job.yml' vars: local_env: | diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/play= books/build/projects/virt-manager.yml index a30718c..c0d4294 100644 --- a/guests/playbooks/build/projects/virt-manager.yml +++ b/guests/playbooks/build/projects/virt-manager.yml @@ -14,7 +14,7 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-18 + - libvirt-ubuntu-1804 archive_format: gz git_url: '{{ git_urls["virt-manager"][git_remote] }}' =20 @@ -35,7 +35,7 @@ - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide - - libvirt-ubuntu-18 + - libvirt-ubuntu-1804 - include: '{{ playbook_base }}/jobs/python-distutils-rpm-job.yml' vars: machines: diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index d4016fb..56310f0 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -22,7 +22,7 @@ # - CentOS, Debian, Fedora, FreeBSD, OpenSUSE, Ubuntu # # Valid OS versions are: -# - CentOS7, Debian9, FedoraRawhide, OpenSUSE151, Ubuntu18 and so on +# - CentOS7, Debian9, FedoraRawhide, OpenSUSE151, Ubuntu1804 and so on # # The arch specific rules use a prefix "$ARCH-" where $ARCH # is a libvirt arch name. @@ -199,8 +199,8 @@ mappings: rpm: glusterfs-api-devel Debian9: glusterfs-common OpenSUSE: glusterfs-devel - Ubuntu16: glusterfs-common - Ubuntu18: glusterfs-common + Ubuntu1604: glusterfs-common + Ubuntu1804: glusterfs-common cross-policy-deb: foreign =20 gnutls: @@ -232,7 +232,7 @@ mappings: =20 gtk-update-icon-cache: default: gtk-update-icon-cache - Ubuntu16: libgtk2.0-bin + Ubuntu1604: libgtk2.0-bin =20 gtk-vnc2: deb: libgtk-vnc-2.0-dev @@ -268,7 +268,7 @@ mappings: pkg: openjdk11 rpm: java-11-openjdk-headless Debian9: openjdk-8-jre-headless - Ubuntu16: openjdk-8-jre-headless + Ubuntu1604: openjdk-8-jre-headless =20 json-glib: deb: libjson-glib-dev @@ -463,8 +463,8 @@ mappings: default: meson CentOS7: Debian9: - Ubuntu16: - Ubuntu18: + Ubuntu1604: + Ubuntu1804: =20 ninja: default: ninja-build @@ -645,7 +645,7 @@ mappings: pkg: ncurses rpm: ncurses-devel Debian9: libncurses5-dev - Ubuntu18: libncurses5-dev + Ubuntu1804: libncurses5-dev cross-policy-deb: foreign =20 netcf: @@ -838,7 +838,7 @@ mappings: default: python3-libxml2 FreeBSD: py36-libxml2 CentOS7: - Ubuntu16: + Ubuntu1604: =20 python3-lxml: default: python3-lxml @@ -853,8 +853,8 @@ mappings: python3-pip: CentOS7: python3-pip Debian9: python3-pip - Ubuntu16: python3-pip - Ubuntu18: python3-pip + Ubuntu1604: python3-pip + Ubuntu1804: python3-pip =20 python3-pytest: default: python3-pytest --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list