summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhanshyam <gmann@ghanshyammann.com>2020-02-06 18:13:13 -0600
committerGhanshyam Mann <gmann@ghanshyammann.com>2020-02-09 23:59:13 +0000
commit0566f104ccf1b30a7f95d05fe20a238d01888dc5 (patch)
tree1b06b6f279f2242da64cb47d7456ab4e5f624ec4
parent1e20d09272b4dbb082e72a663e931a61c81c6b37 (diff)
downloaddesignate-0566f104ccf1b30a7f95d05fe20a238d01888dc5.tar.gz
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
-rw-r--r--.zuul.yaml2
-rw-r--r--playbooks/legacy/designate-devstack-agent-base/run.yaml2
-rw-r--r--playbooks/legacy/designate-devstack-base/run.yaml14
-rw-r--r--playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml2
4 files changed, 16 insertions, 4 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index b1d55c52..a5f851ac 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
@@ -27,6 +27,19 @@
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
+ set -x
export PYTHONUNBUFFERED=true
services=rabbit,tempest,mysql,dstat,key
@@ -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