Use Swift's in-tree DSVM test

While we're at it, make a new job that inherits from it to bring the
legacy-swiftclient-dsvm-functional testing in-tree, too.

For naming, follow naming policy and remove "dsvm" from names.

Remove legacy jobs, they are not needed anymore.

Change-Id: I919c0b77ac4888350194f55a9c12e0742845024f
Depends-On: https://review.openstack.org/589270
This commit is contained in:
Tim Burke 2018-08-13 22:02:38 +00:00 committed by Andreas Jaeger
parent 4330d036cd
commit 70e20b62e6

@ -1,3 +1,29 @@
- job:
name: swiftclient-swift-functional
parent: swift-dsvm-functional
description: |
Run swift's functional tests with python-swiftclient
installed from source instead as package from PyPI.
# Ensure that we install python-swiftclient from git and
# do not install from pypi. This is needed since the parent
# job sets zuul_work_dir to the swift directory and uses tox
# for installation.
required-projects:
- git.openstack.org/openstack/python-swiftclient
- job:
name: swiftclient-functional
parent: swift-dsvm-functional
description: |
Run functional tests of python-swiftclient with
python-swiftclient installed from source instead as package from
PyPI.
required-projects:
- git.openstack.org/openstack/python-swiftclient
vars:
# Override value from parent job to use swiftclient tests
zuul_work_dir: "{{ zuul.projects['git.openstack.org/openstack/python-swiftclient'].src_dir }}"
- project:
templates:
- openstack-python-jobs
@ -10,18 +36,14 @@
- release-notes-jobs-python3
check:
jobs:
- swiftclient-swift-functional
- swiftclient-functional
- openstack-tox-lower-constraints
- legacy-swift-dsvm-functional
- legacy-swift-dsvm-functional-identity-v3-only:
voting: false
- legacy-swiftclient-dsvm-functional
- legacy-swiftclient-dsvm-functional-identity-v3-only:
voting: false
gate:
jobs:
- swiftclient-swift-functional
- swiftclient-functional
- openstack-tox-lower-constraints
- legacy-swift-dsvm-functional
- legacy-swiftclient-dsvm-functional
post:
jobs:
- openstack-tox-cover