From 010fdbe76ff3a4f8f47eec3d30e312d346cf21d6 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Tue, 27 Jul 2021 12:06:52 +0100
Subject: [PATCH] Switch from legacy OSA job to integrated OSA job

This should allow testing of un-merged changes to sahara in the
context of an openstack-ansible deployment

Story: 2009081
Task: 42894

Depends-On: I1bde4186335cb6638d2c90f5eeee1cf7944e1415
Depends-On: I123d32a0967d5196723f57a40ab5acfa7a53a440
Change-Id: Ib6e09ab83b277704a603c02f0927054478cef8a7
---
 .zuul.yaml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 5764db54f2..43c7f28628 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -20,8 +20,7 @@
             voting: false
         - sahara-grenade:
             voting: false
-        - sahara-openstack-ansible-functional:
-            voting: false
+        - openstack-ansible-deploy-aio_sahara_metal-ubuntu-focal
     gate:
       queue: sahara
       jobs:
@@ -32,8 +31,7 @@
         - sahara-tests-tempest
         - sahara-tests-tempest-v2
         # - sahara-grenade
-        - sahara-openstack-ansible-functional:
-            voting: false
+        - openstack-ansible-deploy-aio_sahara_metal-ubuntu-focal
     experimental:
       jobs:
         - sahara-buildimages-ambari
@@ -112,16 +110,9 @@
           - 'sahara_tempest_plugin.tests.api.'
 
 - job:
-    name: sahara-openstack-ansible-functional
-    description: |
-      OSA job focused on openstack-ansible-os_sahara
-    parent: openstack-ansible-cross-repo-functional
-    required-projects:
-      - openstack/openstack-ansible-os_sahara
-    vars:
-      osa_test_repo: openstack/openstack-ansible-os_sahara
-      devstack_localrc:
-        USE_PYTHON3: True
+    name: openstack-ansible-deploy-aio_sahara_metal-ubuntu-focal
+    parent: openstack-ansible-deploy-aio
+    nodeset: ubuntu-focal
 
 - job:
     name: sahara-buildimages-base