Use common functional tox jobs

There's no need to have custom functional jobs, we have them already in
openstack-zuul-jobs. Remove the local definitions and use common one
instead.

Change-Id: I5ecb535612b8cdff5bcbba057caebf241a3b649e
This commit is contained in:
Andreas Jaeger 2017-12-17 19:01:45 +01:00
parent 3acd40e413
commit b6aaaa0110
2 changed files with 4 additions and 16 deletions

View File

@ -1,15 +1,3 @@
- job:
name: octavia-tox-functional
parent: openstack-tox
vars:
tox_envlist: functional
- job:
name: octavia-tox-functional-py35
parent: openstack-tox
vars:
tox_envlist: functional-py35
- job: - job:
name: octavia-v1-dsvm-scenario name: octavia-v1-dsvm-scenario
parent: legacy-dsvm-base parent: legacy-dsvm-base

View File

@ -28,8 +28,8 @@
- ^releasenotes/.*$ - ^releasenotes/.*$
- ^tempest/hacking/.*$ - ^tempest/hacking/.*$
- ^tempest/tests/.*$ - ^tempest/tests/.*$
- octavia-tox-functional - openstack-tox-functional
- octavia-tox-functional-py35: - openstack-tox-functional-py35:
branches: ^(?!stable/ocata).*$ branches: ^(?!stable/ocata).*$
- octavia-v1-dsvm-scenario: - octavia-v1-dsvm-scenario:
irrelevant-files: irrelevant-files:
@ -93,8 +93,8 @@
gate: gate:
queue: octavia queue: octavia
jobs: jobs:
- octavia-tox-functional - openstack-tox-functional
- octavia-tox-functional-py35: - openstack-tox-functional-py35:
branches: ^(?!stable/ocata).*$ branches: ^(?!stable/ocata).*$
- octavia-v1-dsvm-scenario: - octavia-v1-dsvm-scenario:
irrelevant-files: irrelevant-files: