diff options
| author | Zuul <zuul@review.openstack.org> | 2018-12-12 16:51:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-12-12 16:51:26 +0000 |
| commit | 5303bca361b8c4217f30b3eb8911f548bb007999 (patch) | |
| tree | 7aeb54254dbcea6f589b98b6bf0c93724ed85a06 | |
| parent | 235999b9957c7cf53da21b640901055191a5a269 (diff) | |
| parent | 8120cb8b55091d9027c7b8ff519b82a87e7d6b17 (diff) | |
| download | python-openstackclient-5303bca361b8c4217f30b3eb8911f548bb007999.tar.gz | |
Merge "Use devstack functional base job"
| -rw-r--r-- | .zuul.yaml | 12 | ||||
| -rw-r--r-- | playbooks/osc-devstack/post.yaml | 4 | ||||
| -rw-r--r-- | playbooks/osc-devstack/pre.yaml | 8 | ||||
| -rw-r--r-- | playbooks/osc-devstack/run.yaml | 5 |
4 files changed, 1 insertions, 28 deletions
@@ -62,16 +62,9 @@ - job: name: osc-functional-devstack-base - parent: devstack + parent: devstack-tox-functional description: | Base job for devstack-based functional tests - pre-run: playbooks/osc-devstack/pre.yaml - run: playbooks/osc-devstack/run.yaml - post-run: playbooks/osc-devstack/post.yaml - required-projects: - - name: openstack/swift - roles: - - zuul: openstack-infra/devstack timeout: 9000 irrelevant-files: - ^.*\.rst$ @@ -79,7 +72,6 @@ - ^releasenotes/.*$ vars: devstack_localrc: - SWIFT_HASH: '1234123412341234' LIBS_FROM_GIT: python-openstackclient # NOTE(dtroyer): OSC needs to support Image v1 for a while yet so re-enable GLANCE_V1_ENABLED: true @@ -99,7 +91,6 @@ ceilometer-anotification: false ceilometer-api: false ceilometer-collector: false - horizon: false s-account: true s-container: true s-object: true @@ -107,7 +98,6 @@ osc_environment: PYTHONUNBUFFERED: 'true' OS_CLOUD: devstack-admin - tox_install_siblings: false zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient # The Neutron bits are here rather than in osc-functional-devstack-base to diff --git a/playbooks/osc-devstack/post.yaml b/playbooks/osc-devstack/post.yaml deleted file mode 100644 index 7f0cb198..00000000 --- a/playbooks/osc-devstack/post.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - fetch-tox-output - - fetch-subunit-output diff --git a/playbooks/osc-devstack/pre.yaml b/playbooks/osc-devstack/pre.yaml deleted file mode 100644 index 3ec41c9c..00000000 --- a/playbooks/osc-devstack/pre.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- hosts: all - roles: - - run-devstack - - role: bindep - bindep_profile: test - bindep_dir: "{{ zuul_work_dir }}" - - test-setup - - ensure-tox diff --git a/playbooks/osc-devstack/run.yaml b/playbooks/osc-devstack/run.yaml deleted file mode 100644 index d1101dd4..00000000 --- a/playbooks/osc-devstack/run.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- hosts: all - environment: - OS_CLOUD: devstack-admin - roles: - - tox |