From 90c330207e7c92a29457602dd69a0391af518bc6 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Fri, 5 Apr 2019 20:59:51 -0400 Subject: [PATCH] debian: add support This patch adds support for Debian Stretch in addition to a single metal job to validate it as well. Depends-On: I0b4d62c74cdeb68ce05c44aa2abeff6865e4d1ff Depends-On: Id55ff6d54192b282c203753604bcb5fb7dcbd69b Depends-On: Ia977edbb75451f285abbdb64ac1249115ed52a5c Depends-On: I1d218d3f7a43b59f39baaa9a76d1a73df52a0a99 Depends-On: Ia34d43731d880af3b663e62323c14cf77098c984 Depends-On: I97bcfacc55b8afcda6792dd19e7f947cdec38ce4 Depends-On: I3d14906c7ce5e4722fa4b59c4aa6949405f40898 Depends-On: Id426c570dc18ac2824b5785587bceaa794324eb6 Depends-On: I1058238e2467cc257ec48ba84fb89995079e9be7 Depends-On: Ib5e04011519c67e72a0e64f511bc673527eb4db9 Depends-On: Ic8ec8f1490c064f677a34f3857758f30524ef804 Change-Id: I9a92b73c419a0dc1cca40dacfef75de61a61db94 --- playbooks/openstack-hosts-setup.yml | 5 +++-- tests/roles/bootstrap-host/tasks/check-requirements.yml | 5 +++-- .../roles/bootstrap-host/vars/{ubuntu.yml => debian.yml} | 0 zuul.d/jobs.yaml | 9 +++++++++ zuul.d/project-templates.yaml | 2 ++ 5 files changed, 17 insertions(+), 4 deletions(-) rename tests/roles/bootstrap-host/vars/{ubuntu.yml => debian.yml} (100%) diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index b6ccf39218..b848d51f56 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -44,11 +44,12 @@ - name: Check for a supported Operating System assert: that: - - (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or + - (ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch') or + (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic') or (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') or (ansible_os_family == 'Suse' and ansible_distribution_major_version in ['15', '42']) - msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic), CentOS 7 (WIP) and openSUSE Leap 42.X and openSUSE Leap 15.X" + msg: "The only supported platforms for this release are Debian Stretch, Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic), CentOS 7 (WIP) and openSUSE Leap 42.X and openSUSE Leap 15.X" - include_tasks: common-tasks/package-cache-proxy.yml when: install_method == "source" diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml index 96405c8819..65f6f5b062 100644 --- a/tests/roles/bootstrap-host/tasks/check-requirements.yml +++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml @@ -16,12 +16,13 @@ - name: Check for a supported Operating System assert: that: - - (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or + - (ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch') or + (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic') or (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') or (ansible_os_family == 'Suse' and ansible_distribution_major_version in ['42', '15']) msg: >- - The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), + The only supported platforms for this release are Debian Stretch, Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic), CentOS 7, openSUSE Leap 42.X and openSUSE Leap 15.X when: (check_operating_system | default(True))| bool tags: diff --git a/tests/roles/bootstrap-host/vars/ubuntu.yml b/tests/roles/bootstrap-host/vars/debian.yml similarity index 100% rename from tests/roles/bootstrap-host/vars/ubuntu.yml rename to tests/roles/bootstrap-host/vars/debian.yml diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 496e272ef0..e24640630c 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -73,6 +73,15 @@ vars: ansible_package: "file://{{ ansible_user_dir }}/src/github.com/ansible/ansible" +# debian +- job: + name: openstack-ansible-deploy-aio_metal-debian-stable + parent: openstack-ansible-deploy-aio + nodeset: debian-stable + vars: + action: deploy + scenario: aio_metal + # ubuntu - job: name: openstack-ansible-deploy-aio_lxc-ubuntu-bionic diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index c616ce28f3..7ddc268f96 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -69,10 +69,12 @@ name: openstack-ansible-deploy-aio_metal-jobs check: jobs: + - openstack-ansible-deploy-aio_metal-debian-stable - openstack-ansible-deploy-aio_metal-centos-7 - openstack-ansible-deploy-aio_metal-ubuntu-bionic gate: jobs: + - openstack-ansible-deploy-aio_metal-debian-stable - openstack-ansible-deploy-aio_metal-centos-7 - openstack-ansible-deploy-aio_metal-ubuntu-bionic experimental: