From b6aaaa0110003ce86cec45ef0ee1875f6b6f5a3e Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 17 Dec 2017 19:01:45 +0100 Subject: [PATCH] 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 --- zuul.d/jobs.yaml | 12 ------------ zuul.d/projects.yaml | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 6dc81948a6..23611d6489 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -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: name: octavia-v1-dsvm-scenario parent: legacy-dsvm-base diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index e74f429bb4..0b8a32290b 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -28,8 +28,8 @@ - ^releasenotes/.*$ - ^tempest/hacking/.*$ - ^tempest/tests/.*$ - - octavia-tox-functional - - octavia-tox-functional-py35: + - openstack-tox-functional + - openstack-tox-functional-py35: branches: ^(?!stable/ocata).*$ - octavia-v1-dsvm-scenario: irrelevant-files: @@ -93,8 +93,8 @@ gate: queue: octavia jobs: - - octavia-tox-functional - - octavia-tox-functional-py35: + - openstack-tox-functional + - openstack-tox-functional-py35: branches: ^(?!stable/ocata).*$ - octavia-v1-dsvm-scenario: irrelevant-files: