Fix functional jobs

Reenable the functional jobs, they used a non-existing job name due to a
wrong conflict resolution. The openstack-functional jobs are the right
jobs for this purpose.

Change-Id: I7d0fbe498e81e32fbd65c43029ae366520a330eb
Co-Authored-By: Michael Johnson <johnsomor@gmail.com>
This commit is contained in:
Andreas Jaeger 2018-03-11 17:40:49 +01:00 committed by Michael Johnson
parent 649b33d247
commit 9ec8c65256
1 changed files with 4 additions and 4 deletions

View File

@ -11,14 +11,14 @@
- neutron-lbaasv2-dsvm-py3x-scenario:
branches: ^(?!stable/ocata).*$
voting: false
- octavia-tox-functional:
- openstack-tox-functional:
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
- ^doc/.*$
- ^etc/.*$
- ^releasenotes/.*$
- octavia-tox-functional-py35:
- openstack-tox-functional-py35:
branches: ^(?!stable/ocata).*$
irrelevant-files:
- ^.*\.rst$
@ -37,14 +37,14 @@
gate:
queue: octavia
jobs:
- octavia-tox-functional:
- openstack-tox-functional:
irrelevant-files:
- ^.*\.rst$
- ^api-ref/.*$
- ^doc/.*$
- ^etc/.*$
- ^releasenotes/.*$
- octavia-tox-functional-py35:
- openstack-tox-functional-py35:
branches: ^(?!stable/ocata).*$
irrelevant-files:
- ^.*\.rst$