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 <abologna@xxxxxxxxxx>
---
.../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 => libvirt-ubuntu-1604}/docker.yml (100%)
rename guests/host_vars/{libvirt-ubuntu-16 => libvirt-ubuntu-1604}/install.yml (100%)
rename guests/host_vars/{libvirt-ubuntu-16 => libvirt-ubuntu-1604}/main.yml (95%)
rename guests/host_vars/{libvirt-ubuntu-18 => libvirt-ubuntu-1804}/docker.yml (100%)
rename guests/host_vars/{libvirt-ubuntu-18 => libvirt-ubuntu-1804}/install.yml (100%)
rename guests/host_vars/{libvirt-ubuntu-18 => libvirt-ubuntu-1804}/main.yml (95%)
diff --git a/guests/host_vars/libvirt-ubuntu-16/docker.yml b/guests/host_vars/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_vars/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'
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-ubuntu-18/docker.yml b/guests/host_vars/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_vars/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'
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/build/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/playbooks/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/playbooks/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] }}'
diff --git a/guests/playbooks/build/projects/libvirt-go.yml b/guests/playbooks/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] }}'
diff --git a/guests/playbooks/build/projects/libvirt-sandbox.yml b/guests/playbooks/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] }}'
diff --git a/guests/playbooks/build/projects/libvirt-tck.yml b/guests/playbooks/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] }}'
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/playbooks/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] }}'
@@ -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
gnutls:
@@ -232,7 +232,7 @@ mappings:
gtk-update-icon-cache:
default: gtk-update-icon-cache
- Ubuntu16: libgtk2.0-bin
+ Ubuntu1604: libgtk2.0-bin
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
json-glib:
deb: libjson-glib-dev
@@ -463,8 +463,8 @@ mappings:
default: meson
CentOS7:
Debian9:
- Ubuntu16:
- Ubuntu18:
+ Ubuntu1604:
+ Ubuntu1804:
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
netcf:
@@ -838,7 +838,7 @@ mappings:
default: python3-libxml2
FreeBSD: py36-libxml2
CentOS7:
- Ubuntu16:
+ Ubuntu1604:
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
python3-pytest:
default: python3-pytest
--
2.23.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
