From 29ef7431f412975c4ede3a54ec82f65403bd9aa8 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Thu, 24 Mar 2022 13:17:14 +0100
Subject: [PATCH] Create devstack-designate jobs and remove Designate plugin
 from Octavia jobs

Change-Id: Id84b06c37447cd9cc0279ed99758cba6de43c0cb
---
 zuul.d/devstack-tobiko-designate.yaml | 51 +++++++++++++++++++++++++++
 zuul.d/devstack-tobiko-octavia.yaml   | 21 ++---------
 zuul.d/project.yaml                   |  1 +
 3 files changed, 54 insertions(+), 19 deletions(-)
 create mode 100644 zuul.d/devstack-tobiko-designate.yaml

diff --git a/zuul.d/devstack-tobiko-designate.yaml b/zuul.d/devstack-tobiko-designate.yaml
new file mode 100644
index 0000000..c687ef0
--- /dev/null
+++ b/zuul.d/devstack-tobiko-designate.yaml
@@ -0,0 +1,51 @@
+---
+
+- project-template:
+    name: devstack-tobiko-designate
+    description: |
+      DevStack jobs intended to gate Tobiko project changes with Designate
+    check: &CHECK
+      jobs:
+        - devstack-tobiko-designate
+        - devstack-tobiko-functional-designate
+        - devstack-tobiko-ovs-designate
+    gate: &GATE
+      jobs:
+        - devstack-tobiko-designate
+    periodic: *CHECK
+
+
+# --- STANDALONE -------------------------------------------------------------
+
+
+- job:
+    name: devstack-tobiko-designate
+    parent: devstack-tobiko-minimal
+    voting: true
+    required-projects: &REQUIRED_PROJECTS
+      - opendev.org/openstack/designate
+      - opendev.org/openstack/python-designateclient
+    vars: &VARS
+      devstack_localrc:
+        API_WORKERS: 4
+        DESIGNATE_SERVICE_PORT_DNS: 5322
+      devstack_plugins:
+        designate: https://opendev.org/openstack/designate.git
+      devstack_services:
+        designate: true
+
+
+- job:
+    name: devstack-tobiko-ovs-designate
+    parent: devstack-tobiko-ovs
+    voting: true
+    required-projects: *REQUIRED_PROJECTS
+    vars: *VARS
+
+
+- job:
+    name: devstack-tobiko-functional-designate
+    parent: devstack-tobiko-functional
+    voting: true
+    required-projects: *REQUIRED_PROJECTS
+    vars: *VARS
diff --git a/zuul.d/devstack-tobiko-octavia.yaml b/zuul.d/devstack-tobiko-octavia.yaml
index be957e6..d8c2dec 100644
--- a/zuul.d/devstack-tobiko-octavia.yaml
+++ b/zuul.d/devstack-tobiko-octavia.yaml
@@ -6,11 +6,11 @@
       DevStack jobs intended to gate Tobiko project changes
     check: &CHECK
       jobs:
-        - devstack-tobiko-octavia-designate
+        - devstack-tobiko-octavia
         - devstack-tobiko-ovs-octavia
     gate: &GATE
       jobs:
-        - devstack-tobiko-octavia-designate
+        - devstack-tobiko-octavia
     periodic: *CHECK
 
 
@@ -78,23 +78,6 @@
         '/var/log/octavia-amphora.log': logs
 
 
-- job:
-    name: devstack-tobiko-octavia-designate
-    parent: devstack-tobiko-octavia
-    voting: true
-    required-projects:
-      - opendev.org/openstack/designate
-      - opendev.org/openstack/python-designateclient
-    vars:
-      devstack_localrc:
-        API_WORKERS: 4
-        DESIGNATE_SERVICE_PORT_DNS: 5322
-      devstack_plugins:
-        designate: https://opendev.org/openstack/designate.git
-      devstack_services:
-        designate: true
-
-
 - job:
     name: devstack-tobiko-ovs-octavia
     parent: devstack-tobiko-ovs
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ce74807..5f52530 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -5,6 +5,7 @@
       - ansible-role-jobs
       - devstack-tobiko
       - devstack-tobiko-centos
+      - devstack-tobiko-designate
       - devstack-tobiko-fedora
       - devstack-tobiko-functional
       - devstack-tobiko-heat