summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-23 20:33:56 +0000
committerGerrit Code Review <review@openstack.org>2018-07-23 20:33:56 +0000
commitc929ec2dc5c603ea038e5c5ff37fd71a2c89ea24 (patch)
tree7cb611bf2b4df148e0aaa3dd9025b917b1bc40ac
parentcafb81dbea7e660dede790fd43d57a98faaeb261 (diff)
parentd012c21c0c415964ccd9b46c699bbc31eede9b4a (diff)
downloaddesignate-c929ec2dc5c603ea038e5c5ff37fd71a2c89ea24.tar.gz
Merge "Reenable py3.6 tempest jobs + add py36 tox"
-rw-r--r--.zuul.yaml5
-rw-r--r--tox.ini8
2 files changed, 10 insertions, 3 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index e0cb1cb0..b44b7c03 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -159,8 +159,7 @@
- designate-bind9
- designate-bind9-manager-model
- designate-bind9-py35
- - designate-bind9-py36:
- voting: false
+ - designate-bind9-py36
- designate-devstack-pdns4
- designate-devstack-pdns4-postgres
- designate-grenade-pdns4
@@ -170,6 +169,7 @@
- designate-bind9
- designate-bind9-manager-model
- designate-bind9-py35
+ - designate-bind9-py36
- designate-devstack-pdns4
- designate-devstack-pdns4-postgres
- designate-grenade-pdns4
@@ -182,6 +182,7 @@
- project:
templates:
- designate-devstack-jobs
+ - openstack-python36-jobs
check:
jobs:
- neutron-tempest-plugin-designate-scenario
diff --git a/tox.ini b/tox.ini
index b1a46a5a..f7d24b49 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 2.0
-envlist = py35,py27,flake8
+envlist = py35,py27,py36,flake8
skipsdist = True
[testenv]
@@ -39,6 +39,12 @@ commands =
{[testenv]commands}
stestr run '{posargs}'
+[testenv:py36]
+basepython = python3.6
+commands =
+ {[testenv]commands}
+ stestr run '{posargs}'
+
[testenv:docs]
basepython = python3
deps =