From 278b39c2fc4fbe4afda88bc174f383d029b073d9 Mon Sep 17 00:00:00 2001
From: Nate Johnston <njohnsto@redhat.com>
Date: Tue, 26 Apr 2022 17:46:12 -0400
Subject: [PATCH] Add a grenade job for bind9

The current grenade job tests only with pdns4, but it would be valuable
to also test with bind9 to discern upgrade issues when bind9 is in use.

Change-Id: I118cc92e3950540d725f433dfe5d9590cbdab616
---
 .zuul.yaml                    | 24 ++++++++++++++++++------
 devstack/upgrade/resources.sh |  1 +
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index d46a18b64..534f15790 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -118,7 +118,7 @@
         DESIGNATE_BACKEND_DRIVER: pdns4
 
 - job:
-    name: designate-grenade-pdns4
+    name: designate-grenade-common
     parent: grenade
     required-projects:
       - opendev.org/openstack/horizon
@@ -126,7 +126,6 @@
       - opendev.org/openstack/designate-dashboard
       - opendev.org/openstack/designate-tempest-plugin
       - opendev.org/openstack/python-designateclient
-    post-run: playbooks/designate-pdns4/post.yaml
     vars:
       devstack_plugins:
         designate: https://opendev.org/openstack/designate
@@ -145,10 +144,6 @@
         s-object: false
         s-proxy: false
         c-bak: false
-      grenade_devstack_localrc:
-        shared:
-          DESIGNATE_BACKEND_DRIVER: pdns4
-          DESIGNATE_SERVICE_PORT_DNS: 5322
       grenade_localrc:
         BASE_RUN_SMOKE: False
       tox_envlist: all
@@ -162,6 +157,22 @@
       - ^etc/.*$
       - ^releasenotes/.*$
 
+- job:
+    name: designate-grenade-pdns4
+    parent: designate-grenade-common
+    post-run: playbooks/designate-pdns4/post.yaml
+    vars:
+      grenade_devstack_localrc:
+        shared:
+          DESIGNATE_BACKEND_DRIVER: pdns4
+          DESIGNATE_SERVICE_PORT_DNS: 5322
+
+- job:
+    name: designate-grenade-bind9
+    parent: designate-grenade-common
+    post-run: playbooks/designate-bind9/post.yaml
+    voting: false
+
 - job:
     name: designate-tox-dnspython-latest
     parent: openstack-tox
@@ -181,6 +192,7 @@
             voting: false
         - designate-bind9-scoped-tokens
         - designate-pdns4
+        - designate-grenade-bind9
         - designate-grenade-pdns4
         - designate-ipv6-only-pdns4
         - designate-ipv6-only-bind9
diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index 31b06eedb..1fcccb958 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -18,6 +18,7 @@ DESIGNATE_ZONE_EMAIL=hostmaster@example.com
 DESIGNATE_RRSET_NAME=www.example.com.
 DESIGNATE_RRSET_TYPE=A
 DESIGNATE_RRSET_RECORD=10.0.0.1
+DESIGNATE_SERVICE_PORT_DNS=${DESIGNATE_SERVICE_PORT_DNS:-53}
 # used with dig to look up in DNS
 DIG_FLAGS="-p $DESIGNATE_SERVICE_PORT_DNS @$SERVICE_HOST"
 DIG_TIMEOUT=30