Revert "Override GLANCE_USE_IMPORT_WORKFLOW in cinder jobs"

This reverts commit 025ba83c47.

Reason for revert: This is no longer needed as the devstack patch is merged to fix this issue https://review.opendev.org/c/openstack/devstack/+/841804

Change-Id: Ie72a2531172208e32626ad2060737257663eba46
This commit is contained in:
Rajat Dhasmana 2022-05-19 08:26:47 +00:00
parent 025ba83c47
commit f9fad19249
1 changed files with 5 additions and 7 deletions

View File

@ -256,7 +256,7 @@
output_format: raw
- job:
name: glance-multistore-cinder
name: glance-multistore-cinder-import
parent: tempest-integrated-storage
description: |
The regular tempest-integrated-storage job but with multiple cinder
@ -267,10 +267,9 @@
GLANCE_ENABLE_MULTIPLE_STORES: True
CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2
GLANCE_CINDER_DEFAULT_BACKEND: lvmdriver-1
GLANCE_USE_IMPORT_WORKFLOW: False
- job:
name: glance-multistore-cinder-fips
name: glance-multistore-cinder-import-fips
parent: tempest-integrated-storage
description: |
The regular tempest-integrated-storage job but with multiple cinder
@ -284,7 +283,6 @@
GLANCE_ENABLE_MULTIPLE_STORES: True
CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2
GLANCE_CINDER_DEFAULT_BACKEND: lvmdriver-1
GLANCE_USE_IMPORT_WORKFLOW: False
devstack_local_conf:
test-config:
"$TEMPEST_CONFIG":
@ -351,7 +349,7 @@
irrelevant-files: *tempest-irrelevant-files
- tempest-integrated-storage-import-standalone:
irrelevant-files: *tempest-irrelevant-files
- glance-multistore-cinder:
- glance-multistore-cinder-import:
irrelevant-files: *tempest-irrelevant-files
- grenade:
irrelevant-files: *tempest-irrelevant-files
@ -390,7 +388,7 @@
- grenade-multinode
- tempest-pg-full:
irrelevant-files: *tempest-irrelevant-files
- glance-multistore-cinder-fips:
- glance-multistore-cinder-import-fips:
irrelevant-files: *tempest-irrelevant-files
periodic:
jobs:
@ -434,5 +432,5 @@
branches: master
- glance-tox-functional-py36-cursive-tips:
branches: master
- glance-multistore-cinder-fips:
- glance-multistore-cinder-import-fips:
branches: master