summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml2
-rw-r--r--tox.ini24
2 files changed, 4 insertions, 22 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index ef9782f4c..37b1a8c8a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -205,7 +205,7 @@
- project:
templates:
- openstack-cover-jobs
- - openstack-python3-zed-jobs
+ - openstack-python3-jobs
- publish-openstack-docs-pti
- periodic-stable-jobs
- check-requirements
diff --git a/tox.ini b/tox.ini
index 6675acc36..65baa761a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ commands =
allowlist_externals =
bash
find
-passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
+passenv = http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY,PBR_VERSION
[testenv:pep8]
deps =
@@ -72,16 +72,7 @@ commands = {posargs}
commands =
find keystone -type f -name "*.pyc" -delete
oslo_debug_helper {posargs}
-passenv =
- KSTEST_ADMIN_URL
- KSTEST_ADMIN_USERNAME
- KSTEST_ADMIN_PASSWORD
- KSTEST_ADMIN_DOMAIN_ID
- KSTEST_PUBLIC_URL
- KSTEST_USER_USERNAME
- KSTEST_USER_PASSWORD
- KSTEST_USER_DOMAIN_ID
- KSTEST_PROJECT_ID
+passenv = KSTEST_*
[testenv:functional]
deps =
@@ -92,16 +83,7 @@ commands =
find keystone -type f -name "*.pyc" -delete
stestr run {posargs}
stestr slowest
-passenv =
- KSTEST_ADMIN_URL
- KSTEST_ADMIN_USERNAME
- KSTEST_ADMIN_PASSWORD
- KSTEST_ADMIN_DOMAIN_ID
- KSTEST_PUBLIC_URL
- KSTEST_USER_USERNAME
- KSTEST_USER_PASSWORD
- KSTEST_USER_DOMAIN_ID
- KSTEST_PROJECT_ID
+passenv = KSTEST_*
[flake8]
filename= *.py,keystone-manage