Skip to content

Commit b7388dc

Browse files
author
James E. Blair
committed
Zuul: add file extension to playbook path
Zuul now supports including the file extension on the playbook path and omitting the extension is now deprecrated. Update references to include the extension. Change-Id: Ia1747b6c97140b7e12972c7f7b14cb0620ead084
1 parent 40976f0 commit b7388dc

1 file changed

Lines changed: 45 additions & 45 deletions

File tree

.zuul.yaml

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@
33
parent: devstack
44
description: |
55
Base job for devstack-based functional tests
6-
pre-run: playbooks/osc-devstack/pre
7-
run: playbooks/osc-devstack/run
8-
post-run: playbooks/osc-devstack/post
6+
pre-run: playbooks/osc-devstack/pre.yaml
7+
run: playbooks/osc-devstack/run.yaml
8+
post-run: playbooks/osc-devstack/post.yaml
99
required-projects:
1010
- name: openstack/swift
1111
roles:
1212
- zuul: openstack-infra/devstack
1313
timeout: 9000
1414
vars:
1515
devstack_localrc:
16-
SWIFT_HASH: "1234123412341234"
17-
LIBS_FROM_GIT: 'python-openstackclient'
16+
SWIFT_HASH: '1234123412341234'
17+
LIBS_FROM_GIT: python-openstackclient
1818
# NOTE(dtroyer): OSC needs to support Image v1 for a while yet so re-enable
19-
GLANCE_V1_ENABLED: True
19+
GLANCE_V1_ENABLED: true
2020
# NOTE(dtroyer): Functional tests need a bit more volume headroom
2121
VOLUME_BACKING_FILE_SIZE: 20G
2222
devstack_local_conf:
2323
post-config:
24-
"$CINDER_CONF":
24+
$CINDER_CONF:
2525
DEFAULT:
2626
# NOTE(dtroyer): OSC needs to support Volume v1 for a while yet so re-enable
27-
enable_v1_api: True
27+
enable_v1_api: true
2828
devstack_services:
29-
ceilometer-acentral: False
30-
ceilometer-acompute: False
31-
ceilometer-alarm-evaluator: False
32-
ceilometer-alarm-notifier: False
33-
ceilometer-anotification: False
34-
ceilometer-api: False
35-
ceilometer-collector: False
36-
horizon: False
37-
s-account: True
38-
s-container: True
39-
s-object: True
40-
s-proxy: True
29+
ceilometer-acentral: false
30+
ceilometer-acompute: false
31+
ceilometer-alarm-evaluator: false
32+
ceilometer-alarm-notifier: false
33+
ceilometer-anotification: false
34+
ceilometer-api: false
35+
ceilometer-collector: false
36+
horizon: false
37+
s-account: true
38+
s-container: true
39+
s-object: true
40+
s-proxy: true
4141
osc_environment:
4242
PYTHONUNBUFFERED: 'true'
43-
OS_CLOUD: 'devstack-admin'
44-
tox_install_siblings: False
43+
OS_CLOUD: devstack-admin
44+
tox_install_siblings: false
4545
zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
4646

4747
# The Neutron bits are here rather than in osc-functional-devstack-base to
@@ -55,9 +55,9 @@
5555
# NOTE(amotoki): Some neutron features are enabled by devstack plugin
5656
neutron: https://git.openstack.org/openstack/neutron
5757
devstack_services:
58-
neutron-segments: True
59-
q-metering: True
60-
q-qos: True
58+
neutron-segments: true
59+
q-metering: true
60+
q-qos: true
6161
tox_envlist: functional
6262

6363
- job:
@@ -66,20 +66,20 @@
6666
timeout: 7800
6767
vars:
6868
devstack_localrc:
69-
FLAT_INTERFACE: 'br_flat'
70-
PUBLIC_INTERFACE: 'br_pub'
69+
FLAT_INTERFACE: br_flat
70+
PUBLIC_INTERFACE: br_pub
7171
devstack_services:
72-
n-cell: True
73-
n-net: True
74-
neutron: False
75-
neutron-segments: False
76-
q-agt: False
77-
q-dhcp: False
78-
q-l3: False
79-
q-meta: False
80-
q-metering: False
81-
q-qos: False
82-
q-svc: False
72+
n-cell: true
73+
n-net: true
74+
neutron: false
75+
neutron-segments: false
76+
q-agt: false
77+
q-dhcp: false
78+
q-l3: false
79+
q-meta: false
80+
q-metering: false
81+
q-qos: false
82+
q-svc: false
8383
tox_envlist: functional
8484

8585
- job:
@@ -93,19 +93,19 @@
9393
- openstack/python-openstacksdk
9494
vars:
9595
devstack_localrc:
96-
USE_PYTHON3: True
97-
LIBS_FROM_GIT: 'python-openstackclient,python-openstacksdk,osc-lib,os-client-config'
96+
USE_PYTHON3: true
97+
LIBS_FROM_GIT: python-openstackclient,python-openstacksdk,osc-lib,os-client-config
9898
# This is insufficient, but leaving it here as a reminder of what may
9999
# someday be all we need to make this work
100100
# disable_python3_package swift
101-
DISABLED_PYTHON3_PACKAGES: 'swift'
101+
DISABLED_PYTHON3_PACKAGES: swift
102102
devstack_services:
103103
# Swift is not ready for python3 yet: At a minimum keystonemiddleware needs
104104
# to be installed in the py2 env, there are probably other things too...
105-
s-account: False
106-
s-container: False
107-
s-object: False
108-
s-proxy: False
105+
s-account: false
106+
s-container: false
107+
s-object: false
108+
s-proxy: false
109109
tox_envlist: functional-tips
110110

111111
- project:

0 commit comments

Comments
 (0)