From 107c21c2207ad71e1d4ff447c9fa103b0e2c865a Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Tue, 12 Jun 2018 13:45:57 +0100 Subject: [PATCH] SUSE: Add support for openSUSE Leap 15 Depends-On: https://review.openstack.org/#/c/578281 Change-Id: I21cf4143fb2489f4d5a0e7c78e32ba703d78faa2 --- meta/main.yml | 1 + vars/{suse-42.yml => suse.yml} | 2 +- zuul.d/jobs.yaml | 31 +++++++++++++++++++++++++++++++ zuul.d/project.yaml | 5 +++++ 4 files changed, 38 insertions(+), 1 deletion(-) rename vars/{suse-42.yml => suse.yml} (97%) diff --git a/meta/main.yml b/meta/main.yml index 014c4b2..8857f32 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -31,6 +31,7 @@ galaxy_info: - 42.1 - 42.2 - 42.3 + - 15.0 categories: - cloud - lxc diff --git a/vars/suse-42.yml b/vars/suse.yml similarity index 97% rename from vars/suse-42.yml rename to vars/suse.yml index 7f3f7f7..624293f 100644 --- a/vars/suse-42.yml +++ b/vars/suse.yml @@ -30,7 +30,7 @@ lxc_container_enable_resolved: false lxc_container_map: distro: opensuse arch: amd64 - release: "42.3" + release: "{{ hostvars[physical_host]['ansible_distribution_version'] }}" lxc_container_default_config_list: - "lxc.start.auto=1" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 219721b..cb453f0 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -41,6 +41,13 @@ vars: tox_env: dir +- job: + name: openstack-ansible-dir-opensuse-150 + parent: openstack-ansible-functional + nodeset: opensuse-150 + vars: + tox_env: dir + - job: name: openstack-ansible-btrfs-ubuntu-xenial parent: openstack-ansible-functional @@ -57,6 +64,14 @@ vars: tox_env: btrfs +- job: + name: openstack-ansible-btrfs-opensuse-150 + parent: openstack-ansible-functional + nodeset: opensuse-150 + voting: false + vars: + tox_env: btrfs + - job: name: openstack-ansible-btrfs-centos-7 parent: openstack-ansible-functional @@ -81,6 +96,14 @@ vars: tox_env: mnctl +- job: + name: openstack-ansible-machinectl-opensuse-150 + parent: openstack-ansible-functional + nodeset: opensuse-150 + voting: false + vars: + tox_env: mnctl + - job: name: openstack-ansible-machinectl-centos-7 parent: openstack-ansible-functional @@ -105,6 +128,14 @@ vars: tox_env: ofs +- job: + name: openstack-ansible-overlayfs-opensuse-150 + parent: openstack-ansible-functional + nodeset: opensuse-150 + voting: false + vars: + tox_env: ofs + - job: name: openstack-ansible-overlayfs-centos-7 parent: openstack-ansible-functional diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 55d2bc9..9b43879 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -18,17 +18,21 @@ - openstack-ansible-linters - openstack-ansible-dir-centos-7 - openstack-ansible-dir-opensuse-423 + - openstack-ansible-dir-opensuse-150 - openstack-ansible-dir-ubuntu-bionic - openstack-ansible-dir-ubuntu-xenial - openstack-ansible-btrfs-ubuntu-xenial - openstack-ansible-btrfs-centos-7 - openstack-ansible-btrfs-opensuse-423 + - openstack-ansible-btrfs-opensuse-150 - openstack-ansible-machinectl-ubuntu-xenial - openstack-ansible-machinectl-centos-7 - openstack-ansible-machinectl-opensuse-423 + - openstack-ansible-machinectl-opensuse-150 - openstack-ansible-overlayfs-ubuntu-xenial - openstack-ansible-overlayfs-centos-7 - openstack-ansible-overlayfs-opensuse-423 + - openstack-ansible-overlayfs-opensuse-150 - openstack-ansible-zfs-ubuntu-xenial experimental: jobs: @@ -38,5 +42,6 @@ - openstack-ansible-linters - openstack-ansible-dir-centos-7 - openstack-ansible-dir-opensuse-423 + - openstack-ansible-dir-opensuse-150 - openstack-ansible-dir-ubuntu-bionic - openstack-ansible-dir-ubuntu-xenial