summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2018-08-13 22:02:38 +0000
committerAndreas Jaeger <aj@suse.com>2018-09-12 08:05:04 +0200
commit4ef06cc7b986a192b82dd332076418947f3ecb47 (patch)
treedd755b017e3b252a2247f896cb42c376c85906fb
parent0319152ee6200e3eff955d055f8afe03d6d63e3c (diff)
downloadpython-swiftclient-4ef06cc7b986a192b82dd332076418947f3ecb47.tar.gz
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/600344 (cherry picked from commit 70e20b62e6719c97267aa0e5a80dae2e31dfba76)
-rw-r--r--.zuul.yaml38
1 files changed, 30 insertions, 8 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 2d001c1..23e1fab 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -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
@@ -9,18 +35,14 @@
- release-notes-jobs
check:
jobs:
- - 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
- openstack-tox-py36:
voting: false
+ - swiftclient-swift-functional
+ - swiftclient-functional
gate:
jobs:
- - legacy-swift-dsvm-functional
- - legacy-swiftclient-dsvm-functional
+ - swiftclient-swift-functional
+ - swiftclient-functional
post:
jobs:
- openstack-tox-cover