From 520cd8be8c1e622e3d4893ab68887cd7dc08c1d1 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 18 Dec 2017 14:49:33 -0600 Subject: [PATCH] Remove run-tests and py3-run-tests We have standard jobs for doing unittests under python2 and python3 - namely, the builtin tox environments py27 and py35. Just use those and remove the locally defined jobs. Depends-On: I6d7a96adf5cfb075f5a2ffbd089ccbb883a1c1b4 Change-Id: I0cc0c07daafba331a64861c134029e443ba2aa8d --- .zuul.yaml | 25 ------------------------- tox.ini | 7 ------- 2 files changed, 32 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8f4b1cae..bbadd839 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -4,21 +4,6 @@ - name: primary label: ubuntu-xenial -- job: - name: devstack-gate-tox-run-tests - parent: openstack-tox - description: | - Run tests using ``run-tests`` environment. - vars: - tox_envlist: run-tests - -- job: - name: devstack-gate-tox-py3-run-tests - parent: openstack-tox - description: | - Run tests using ``py3-run-tests`` environment. - vars: - tox_envlist: py3-run-tests - project: name: openstack-infra/devstack-gate @@ -27,13 +12,3 @@ - devstack: files: - ^roles/ - - openstack-tox-py27 - - openstack-tox-py35 - - devstack-gate-tox-run-tests - - devstack-gate-tox-py3-run-tests - gate: - jobs: - - openstack-tox-py27 - - openstack-tox-py35 - - devstack-gate-tox-run-tests - - devstack-gate-tox-py3-run-tests diff --git a/tox.ini b/tox.ini index aa1ce93d..d935904b 100644 --- a/tox.ini +++ b/tox.ini @@ -10,13 +10,6 @@ deps = -r{toxinidir}/test-requirements.txt commands = bash -c "./run-tests.sh" -[testenv:run-tests] -deps = -r{toxinidir}/test-requirements.txt - -[testenv:py3-run-tests] -basepython = python3 -deps = -r{toxinidir}/test-requirements.txt - [testenv:bashate] deps= {env:BASHATE_INSTALL_PATH:bashate==0.5.0}