Skip to content

Commit 8120cb8

Browse files
emontyjharbott
authored andcommitted
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
1 parent 4f66f66 commit 8120cb8

4 files changed

Lines changed: 1 addition & 28 deletions

File tree

.zuul.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,16 @@
6262

6363
- job:
6464
name: osc-functional-devstack-base
65-
parent: devstack
65+
parent: devstack-tox-functional
6666
description: |
6767
Base job for devstack-based functional tests
68-
pre-run: playbooks/osc-devstack/pre.yaml
69-
run: playbooks/osc-devstack/run.yaml
70-
post-run: playbooks/osc-devstack/post.yaml
71-
required-projects:
72-
- name: openstack/swift
73-
roles:
74-
- zuul: openstack-infra/devstack
7568
timeout: 9000
7669
irrelevant-files:
7770
- ^.*\.rst$
7871
- ^doc/.*$
7972
- ^releasenotes/.*$
8073
vars:
8174
devstack_localrc:
82-
SWIFT_HASH: '1234123412341234'
8375
LIBS_FROM_GIT: python-openstackclient
8476
# NOTE(dtroyer): OSC needs to support Image v1 for a while yet so re-enable
8577
GLANCE_V1_ENABLED: true
@@ -99,15 +91,13 @@
9991
ceilometer-anotification: false
10092
ceilometer-api: false
10193
ceilometer-collector: false
102-
horizon: false
10394
s-account: true
10495
s-container: true
10596
s-object: true
10697
s-proxy: true
10798
osc_environment:
10899
PYTHONUNBUFFERED: 'true'
109100
OS_CLOUD: devstack-admin
110-
tox_install_siblings: false
111101
zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
112102

113103
# The Neutron bits are here rather than in osc-functional-devstack-base to

playbooks/osc-devstack/post.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

playbooks/osc-devstack/pre.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

playbooks/osc-devstack/run.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)