From 566d7e48ca6f86120367c6c842bfd89229133f8f Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 26 Mar 2019 19:18:20 +0000
Subject: [PATCH] Remove experimetal scenarios

These scenarios will be defined in their respective role
repositories instead. This reduces the changes to the job
configuration in this repo, which reduces the merge
conflicts when trying to add new scenarios.

Change-Id: Ic49c0729e084d8640018bd8b1ae84158cb8f3ed1
---
 zuul.d/jobs.yaml              | 23 -----------------------
 zuul.d/project-templates.yaml |  4 ----
 2 files changed, 27 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6d02d7f607..392fe1bed3 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -177,29 +177,6 @@
       action: deploy
       scenario: translations
 
-- job:
-    name: openstack-ansible-deploy-aio_congress-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-    vars:
-      action: deploy
-      scenario: aio_congress
-
-- job:
-    name: openstack-ansible-deploy-barbican-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-    vars:
-      action: deploy
-      scenario: barbican
-
-- job:
-    name: openstack-ansible-deploy-blazar-ubuntu-bionic
-    parent: openstack-ansible-deploy-aio_lxc-ubuntu-bionic
-    vars:
-      action: deploy
-      scenario: blazar
-
 # centos
 - job:
     name: openstack-ansible-deploy-aio_lxc-centos-7
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 9696c99474..e1ef7a66e8 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -30,13 +30,9 @@
     experimental:
       jobs:
         - openstack-ansible-deploy-aio_nspawn-ubuntu-bionic
-        - openstack-ansible-deploy-barbican-ubuntu-bionic
-        - openstack-ansible-deploy-aio_congress-ubuntu-bionic
-        - openstack-ansible-deploy-aio_octavia-ubuntu-bionic
         - openstack-ansible-deploy-aio_qdrouterd-ubuntu-bionic
         - openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-bionic
         - openstack-ansible-deploy_with_ansible_next-aio-ubuntu-bionic
-        - openstack-ansible-deploy-blazar-ubuntu-bionic
 
 - project-template:
     name: openstack-ansible-deploy-aio_lxc-jobs