From ca6824bffecc13d70e36a2344e5cb9c7c8e58000 Mon Sep 17 00:00:00 2001
From: Sagi Shnaidman <sshnaidm@redhat.com>
Date: Tue, 11 May 2021 01:04:29 +0300
Subject: [PATCH] Configure only one tripleo job

Because we run only one job, no need to set content provider.
Change-Id: I85ad4281906a6d4aec4dceb4e6fc985e8c60f1a8
---
 .zuul.yaml | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index bfbec223..d687dfd1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -320,8 +320,11 @@
 
 # TripleO jobs
 - job:
-    name: tripleo-ci-centos-8-content-provider-osa
-    parent: tripleo-ci-centos-8-content-provider
+    name: tripleo-ci-centos-8-standalone-osa
+    parent: tripleo-ci-centos-8-standalone
+    vars:
+      consumer_job: false
+      build_container_images: true
     # Run only on files used in TripleO
     files: &ooo_files
       - ^plugins/modules/catalog_service.*$
@@ -336,16 +339,6 @@
       - ^plugins/modules/stack.*$
       - ^plugins/module_utils/openstack.*$
 
-- job:
-    name: tripleo-ci-centos-8-standalone-osa
-    parent: tripleo-ci-centos-8-standalone
-    files: *ooo_files
-    vars:
-      consumer_job: true
-      build_container_images: false
-      remove_tags:
-        - build
-
 - project:
     check:
       jobs:
@@ -392,14 +385,10 @@
             dependencies: *deps_unit_lint
             irrelevant-files: *ignore_files
 
-        - tripleo-ci-centos-8-content-provider-osa:
-            dependencies: *deps_unit_lint
         - tripleo-ci-centos-8-standalone-osa:
-            dependencies:
-              - tox-pep8
-              - openstack-tox-linters-ansible-2.9
-              - openstack-tox-linters-ansible-2.11
-              - tripleo-ci-centos-8-content-provider-osa
+            # Set voting to true when TripleO CI is back
+            voting: false
+            dependencies: *deps_unit_lint
 
     gate:
       jobs:
@@ -417,11 +406,7 @@
         - ansible-collections-openstack-functional-devstack-train-ansible-2.11
         # - ansible-collections-openstack-functional-devstack-queens-ansible-2.11
         - ansible-collections-openstack-functional-devstack-octavia
-        - tripleo-ci-centos-8-content-provider-osa
-        - tripleo-ci-centos-8-standalone-osa:
-            dependencies:
-              - tripleo-ci-centos-8-content-provider-osa
-
+        - tripleo-ci-centos-8-standalone-osa
 
     periodic:
       jobs: