Move legacy-swift-dsvm-functional job in-tree
Note that there's no swift-dsvm-functional-identity-v3-only because
as of the Queens release, that's the *only* way Keystone gets deployed.
Also, remove legacy jobs - see I8b353cba66b22de42ae42954ec44e5802224fc23.
Depends-On: https://review.openstack.org/600916
Change-Id: I49d963b98f3df21fea0db24c83553ef873ad73c8
(cherry picked from commit 1d65219445
)
This commit is contained in:
parent
e7f86004f0
commit
b38a303d68
61
.zuul.yaml
61
.zuul.yaml
|
@ -93,6 +93,39 @@
|
||||||
parent: swift-tox-func-ec
|
parent: swift-tox-func-ec
|
||||||
nodeset: centos-7
|
nodeset: centos-7
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: swift-dsvm-functional
|
||||||
|
parent: devstack-minimal
|
||||||
|
description: |
|
||||||
|
Setup a Swift/Keystone environment and run Swift's func tests
|
||||||
|
required-projects:
|
||||||
|
- git.openstack.org/openstack/requirements
|
||||||
|
- git.openstack.org/openstack/swift
|
||||||
|
- git.openstack.org/openstack/keystone
|
||||||
|
timeout: 2700
|
||||||
|
vars:
|
||||||
|
tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
|
||||||
|
# This tox env get run twice; once for Keystone and once for tempauth
|
||||||
|
tox_envlist: func
|
||||||
|
devstack_localrc:
|
||||||
|
SWIFT_HASH: changeme
|
||||||
|
# We don't need multiple replicas to run purely functional tests.
|
||||||
|
# In fact, devstack special cases some things when there's only
|
||||||
|
# one replica.
|
||||||
|
SWIFT_REPLICAS: 1
|
||||||
|
# One replica => no need for replicators, etc.
|
||||||
|
SWIFT_START_ALL_SERVICES: False
|
||||||
|
# Keystone v3 is currently the default, but may as well be explicit
|
||||||
|
ENABLE_IDENTITY_V2: False
|
||||||
|
IDENTITY_API_VERSION: 3
|
||||||
|
devstack_services:
|
||||||
|
keystone: true
|
||||||
|
swift: true
|
||||||
|
zuul_work_dir: src/git.openstack.org/openstack/swift
|
||||||
|
pre-run: tools/playbooks/dsvm/pre.yaml
|
||||||
|
run: tools/playbooks/dsvm/run.yaml
|
||||||
|
post-run: tools/playbooks/dsvm/post.yaml
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- publish-openstack-sphinx-docs
|
- publish-openstack-sphinx-docs
|
||||||
|
@ -108,21 +141,11 @@
|
||||||
- swift-tox-func-encryption
|
- swift-tox-func-encryption
|
||||||
- swift-tox-func-ec
|
- swift-tox-func-ec
|
||||||
- openstack-tox-pep8
|
- openstack-tox-pep8
|
||||||
- legacy-swift-dsvm-functional:
|
- swift-dsvm-functional:
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^api-ref/.*$
|
- ^(api-ref|doc|releasenotes)/.*$
|
||||||
- ^doc/.*$
|
- ^test/probe/.*$
|
||||||
- ^install-guide/.*$
|
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
|
||||||
- ^releasenotes/.*$
|
|
||||||
- ^test/unit/.*$
|
|
||||||
- legacy-swift-dsvm-functional-identity-v3-only:
|
|
||||||
voting: false
|
|
||||||
irrelevant-files:
|
|
||||||
- ^api-ref/.*$
|
|
||||||
- ^doc/.*$
|
|
||||||
- ^install-guide/.*$
|
|
||||||
- ^releasenotes/.*$
|
|
||||||
- ^test/unit/.*$
|
|
||||||
- legacy-tempest-dsvm-neutron-full:
|
- legacy-tempest-dsvm-neutron-full:
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^(test-|)requirements.txt$
|
- ^(test-|)requirements.txt$
|
||||||
|
@ -149,13 +172,11 @@
|
||||||
- swift-tox-func-encryption
|
- swift-tox-func-encryption
|
||||||
- swift-tox-func-ec
|
- swift-tox-func-ec
|
||||||
- openstack-tox-pep8
|
- openstack-tox-pep8
|
||||||
- legacy-swift-dsvm-functional:
|
- swift-dsvm-functional:
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^api-ref/.*$
|
- ^(api-ref|doc|releasenotes)/.*$
|
||||||
- ^doc/.*$
|
- ^test/probe/.*$
|
||||||
- ^install-guide/.*$
|
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG)$
|
||||||
- ^releasenotes/.*$
|
|
||||||
- ^test/unit/.*$
|
|
||||||
- legacy-tempest-dsvm-neutron-full:
|
- legacy-tempest-dsvm-neutron-full:
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^(test-|)requirements.txt$
|
- ^(test-|)requirements.txt$
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
- hosts: all
|
||||||
|
roles:
|
||||||
|
- fetch-tox-output
|
||||||
|
- fetch-subunit-output
|
|
@ -0,0 +1,9 @@
|
||||||
|
- hosts: all
|
||||||
|
roles:
|
||||||
|
- orchestrate-devstack
|
||||||
|
# Run bindep and test-setup after devstack so that they won't interfere
|
||||||
|
- role: bindep
|
||||||
|
bindep_profile: test
|
||||||
|
bindep_dir: "{{ zuul_work_dir }}"
|
||||||
|
- test-setup
|
||||||
|
- ensure-tox
|
|
@ -0,0 +1,11 @@
|
||||||
|
- hosts: all
|
||||||
|
tasks:
|
||||||
|
- name: Run func tests with Keystone users
|
||||||
|
include_role:
|
||||||
|
name: tox
|
||||||
|
- name: Run func tests with tempauth users
|
||||||
|
include_role:
|
||||||
|
name: tox
|
||||||
|
vars:
|
||||||
|
tox_environment:
|
||||||
|
SWIFT_TEST_CONFIG_FILE: test/sample.conf
|
Loading…
Reference in New Issue