openstack
/
glance
Code Issues Proposed changes

Merge "Revert "Override GLANCE_USE_IMPORT_WORKFLOW in cinder jobs""

This commit is contained in:
Zuul 2022-05-23 07:15:32 +00:00 committed by Gerrit Code Review
parent 6c504b3210 f9fad19249
commit 532e52733c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.zuul.yaml
View File

@ -249,7 +249,7 @@
output_format: raw output_format: raw
- job: - job:
name: glance-multistore-cinder name: glance-multistore-cinder-import
parent: tempest-integrated-storage parent: tempest-integrated-storage
description: | description: |
The regular tempest-integrated-storage job but with multiple cinder The regular tempest-integrated-storage job but with multiple cinder
@ -260,10 +260,9 @@
GLANCE_ENABLE_MULTIPLE_STORES: True GLANCE_ENABLE_MULTIPLE_STORES: True
CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2 CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2
GLANCE_CINDER_DEFAULT_BACKEND: lvmdriver-1 GLANCE_CINDER_DEFAULT_BACKEND: lvmdriver-1
GLANCE_USE_IMPORT_WORKFLOW: False
- job: - job:
name: glance-multistore-cinder-fips name: glance-multistore-cinder-import-fips
parent: tempest-integrated-storage parent: tempest-integrated-storage
description: | description: |
The regular tempest-integrated-storage job but with multiple cinder The regular tempest-integrated-storage job but with multiple cinder
@ -277,7 +276,6 @@
GLANCE_ENABLE_MULTIPLE_STORES: True GLANCE_ENABLE_MULTIPLE_STORES: True
CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2 CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2
GLANCE_CINDER_DEFAULT_BACKEND: lvmdriver-1 GLANCE_CINDER_DEFAULT_BACKEND: lvmdriver-1
GLANCE_USE_IMPORT_WORKFLOW: False
devstack_local_conf: devstack_local_conf:
test-config: test-config:
"$TEMPEST_CONFIG": "$TEMPEST_CONFIG":
@ -343,7 +341,7 @@
irrelevant-files: *tempest-irrelevant-files irrelevant-files: *tempest-irrelevant-files
- tempest-integrated-storage-import-standalone: - tempest-integrated-storage-import-standalone:
irrelevant-files: *tempest-irrelevant-files irrelevant-files: *tempest-irrelevant-files
- glance-multistore-cinder: - glance-multistore-cinder-import:
irrelevant-files: *tempest-irrelevant-files irrelevant-files: *tempest-irrelevant-files
- grenade: - grenade:
irrelevant-files: *tempest-irrelevant-files irrelevant-files: *tempest-irrelevant-files
@ -382,7 +380,7 @@
- grenade-multinode - grenade-multinode
- tempest-pg-full: - tempest-pg-full:
irrelevant-files: *tempest-irrelevant-files irrelevant-files: *tempest-irrelevant-files
- glance-multistore-cinder-fips: - glance-multistore-cinder-import-fips:
irrelevant-files: *tempest-irrelevant-files irrelevant-files: *tempest-irrelevant-files
periodic: periodic:
jobs: jobs:
@ -426,5 +424,5 @@
branches: master branches: master
- glance-tox-functional-py38-cursive-tips: - glance-tox-functional-py38-cursive-tips:
branches: master branches: master
- glance-multistore-cinder-fips: - glance-multistore-cinder-import-fips:
branches: master branches: master