From 6bf107e7b8a06c9865550600a626d133b2084f29 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Fri, 16 Oct 2020 17:11:38 +0300
Subject: [PATCH] Fail if we're trying to use distro path for bionic

Depends-On: https://review.opendev.org/758570
Depends-On: https://review.opendev.org/758575
Change-Id: Ibca86cfd2e01415853fd67e4496febc1780acc45
---
 playbooks/openstack-hosts-setup.yml |  5 +++++
 zuul.d/jobs.yaml                    | 15 ---------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml
index 4dfee5a25d..34e0fb4aea 100644
--- a/playbooks/openstack-hosts-setup.yml
+++ b/playbooks/openstack-hosts-setup.yml
@@ -60,6 +60,11 @@
         msg: >
           The only supported platforms for this release are Debian 10 (Buster),
           Ubuntu 18.04 LTS (Bionic), Ubuntu 20.04 LTS (Focal) and  CentOS 8
+    - name: Check for a supported path
+      assert:
+        that:
+          - not (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic' and install_method == 'distro')
+        msg: Distro installation path is not supported for this release for Ubuntu 18.04 (bionic)
   roles:
     - role: "openstack_hosts"
   vars_files:
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 5514b59b49..38d4f5072d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -254,11 +254,6 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-bionic
 
-- job:
-    name: openstack-ansible-deploy-aio_distro_lxc-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-
 - job:
     name: openstack-ansible-deploy-aio_ceph-ubuntu-bionic
     parent: openstack-ansible-deploy-aio
@@ -274,11 +269,6 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-bionic
 
-- job:
-    name: openstack-ansible-deploy-aio_distro_ceph-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-
 - job:
     name: openstack-ansible-deploy-aio_metal-ubuntu-bionic
     parent: openstack-ansible-deploy-aio
@@ -294,11 +284,6 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-bionic
 
-- job:
-    name: openstack-ansible-deploy-aio_distro_metal-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-
 - job:
     name: openstack-ansible-upgrade-aio_lxc-ubuntu-bionic
     parent: openstack-ansible-deploy-aio