From 36086c73df5d1552e531bc0729207bb2bd875ac8 Mon Sep 17 00:00:00 2001
From: Ghanshyam <gmann@ghanshyammann.com>
Date: Thu, 6 Feb 2020 18:13:13 -0600
Subject: Use Tempest 'all' tox env

Tempest recently moved tox default
to py3 including all-plugin env.
-https://review.opendev.org/#/c/703011/

This will fail the py2 jobs which are using
all-plugin tox env. Because tox all-plugin
env var enable the sitepackages=True. Py2 jobs
install the tempest plugins on py2 and all-plugin
tox try to find the installed plugins on py3 which
cause no test to run and fail the job.

tox all-plugin has been deprecated since long and not
supposed to use for plugins who already in migrated to
separate repo in queens cycle.

Enable designate-tempest-plugin and using tox 'all' env
to fix the issue.

Change-Id: Ib1a2be90c0b3dbacc6daf52f0fc6f326ab47fc98
Closes-Bug: 1862240
---
 .zuul.yaml                                                 |  2 +-
 playbooks/legacy/designate-devstack-agent-base/run.yaml    |  2 +-
 playbooks/legacy/designate-devstack-base/run.yaml          | 14 +++++++++++++-
 playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4f6de29e..bbafde46 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,7 +10,7 @@
         designate: https://opendev.org/openstack/designate
       devstack_services:
         designate: true
-      tox_envlist: all-plugin
+      tox_envlist: all
       tempest_test_regex: |
         designate_tempest_plugin.*
     required-projects:
diff --git a/playbooks/legacy/designate-devstack-agent-base/run.yaml b/playbooks/legacy/designate-devstack-agent-base/run.yaml
index 1d532cc4..b4a06750 100644
--- a/playbooks/legacy/designate-devstack-agent-base/run.yaml
+++ b/playbooks/legacy/designate-devstack-agent-base/run.yaml
@@ -33,6 +33,7 @@
           DESIGNATE_SERVICE_PORT_DNS=5322
           DESIGNATE_BACKEND_DRIVER=agent
           DESIGNATE_AGENT_BACKEND_DRIVER={{ backend_driver }}
+          TEMPEST_PLUGINS='/opt/stack/new/designate-tempest-plugin'
 
           EOF
         executable: /bin/bash
@@ -46,7 +47,6 @@
           export PYTHONUNBUFFERED=true
 
           export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export DEVSTACK_GATE_TEMPEST_REGEX=designate
 
           export PROJECTS="openstack/designate $PROJECTS"
diff --git a/playbooks/legacy/designate-devstack-base/run.yaml b/playbooks/legacy/designate-devstack-base/run.yaml
index d36f96b2..8483f551 100644
--- a/playbooks/legacy/designate-devstack-base/run.yaml
+++ b/playbooks/legacy/designate-devstack-base/run.yaml
@@ -23,6 +23,19 @@
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
 
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          cat << 'EOF' >>"/tmp/dg-local.conf"
+          [[local|localrc]]
+          TEMPEST_PLUGINS='/opt/stack/new/designate-tempest-plugin'
+
+          EOF
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
     - shell:
         cmd: |
           set -e
@@ -40,7 +53,6 @@
           services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
 
           export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export DEVSTACK_GATE_TEMPEST_REGEX=designate
 
           export DEVSTACK_LOCAL_CONFIG="enable_plugin designate https://opendev.org/openstack/designate"
diff --git a/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml b/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
index 1dc9e5f3..44628651 100644
--- a/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
+++ b/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
@@ -31,6 +31,7 @@
           [[local|localrc]]
           DESIGNATE_SERVICE_PORT_DNS=5322
           DESIGNATE_BACKEND_DRIVER=pdns4
+          TEMPEST_PLUGINS=' ../designate-tempest-plugin'
 
           EOF
         executable: /bin/bash
@@ -44,7 +45,6 @@
           export PYTHONUNBUFFERED=true
 
           export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export DEVSTACK_GATE_GRENADE=pullup
           export DEVSTACK_GATE_TEMPEST_REGEX="designate_tempest_plugin(?!\.tests.api.v1).*"
           export DEVSTACK_GATE_HORIZON=1
-- 
cgit v1.2.1