Merge "zuul: fixes for the A/A job (nodeset, variables)" into stable/wallaby
This commit is contained in:
commit
8dd2a8166e
|
@ -163,8 +163,7 @@
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: cinder-plugin-ceph-tempest-mn-aa
|
name: cinder-plugin-ceph-tempest-mn-aa
|
||||||
nodeset: openstack-two-node-bionic
|
parent: devstack-plugin-ceph-multinode-tempest-py3
|
||||||
parent: devstack-plugin-ceph-tempest-py3
|
|
||||||
roles:
|
roles:
|
||||||
- zuul: opendev.org/openstack/cinderlib
|
- zuul: opendev.org/openstack/cinderlib
|
||||||
- zuul: opendev.org/openstack/cinder-tempest-plugin
|
- zuul: opendev.org/openstack/cinder-tempest-plugin
|
||||||
|
@ -175,15 +174,13 @@
|
||||||
vars:
|
vars:
|
||||||
zuul_additional_subunit_dirs:
|
zuul_additional_subunit_dirs:
|
||||||
- "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
|
- "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
|
||||||
|
devstack_localrc:
|
||||||
|
TEMPEST_VOLUME_REVERT_TO_SNAPSHOT: True
|
||||||
devstack_local_conf:
|
devstack_local_conf:
|
||||||
post-config:
|
post-config:
|
||||||
$CINDER_CONF:
|
$CINDER_CONF:
|
||||||
DEFAULT:
|
DEFAULT:
|
||||||
cluster: ceph
|
cluster: ceph
|
||||||
test-config:
|
|
||||||
$TEMPEST_CONFIG:
|
|
||||||
volume-feature-enabled:
|
|
||||||
volume_revert: True
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: cinder-grenade-mn-sub-bak
|
name: cinder-grenade-mn-sub-bak
|
||||||
|
|
Loading…
Reference in New Issue