From 8120cb8b55091d9027c7b8ff519b82a87e7d6b17 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 6 Dec 2017 09:33:23 -0600
Subject: [PATCH] Use devstack functional base job
We extracted some of our functional base job to the devstack repo.
Consume it.
Change-Id: I11e6f9dab935e4b2cd16228f031f7e0adb3a6c89
Depends-On: I84de60181cb88574e341ff83cd4857cce241f2dd
---
.zuul.yaml | 12 +-----------
playbooks/osc-devstack/post.yaml | 4 ----
playbooks/osc-devstack/pre.yaml | 8 --------
playbooks/osc-devstack/run.yaml | 5 -----
4 files changed, 1 insertion(+), 28 deletions(-)
delete mode 100644 playbooks/osc-devstack/post.yaml
delete mode 100644 playbooks/osc-devstack/pre.yaml
delete mode 100644 playbooks/osc-devstack/run.yaml
diff --git a/.zuul.yaml b/.zuul.yaml
index 7cf30cf138..d646a0f766 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -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 7f0cb19824..0000000000
--- 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 3ec41c9cbd..0000000000
--- 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 d1101dd4a1..0000000000
--- a/playbooks/osc-devstack/run.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- hosts: all
- environment:
- OS_CLOUD: devstack-admin
- roles:
- - tox