Override GLANCE_USE_IMPORT_WORKFLOW in cinder jobs

With change[1], we moved glance cinder jobs parent from
tempest-integrated-storage-import to regular
tempest-integrated-storage job but this job also has
import workflow enabled[2].
In this patch we are overriding GLANCE_USE_IMPORT_WORKFLOW
to False in cinder jobs to ensure that import workflow
is disabled in those jobs.
Also removing -import from job names since it's not using
import plugin anymore.

[1] https://review.opendev.org/c/openstack/glance/+/841548
[2] https://opendev.org/openstack/tempest/src/branch/master/zuul.d/integrated-gate.yaml#L195

Related-Bug: #1973136
Change-Id: I2775e007f942feed8fa6ae5e385c03992859edc1

.zuul.yaml

@@ -256,7 +256,7 @@
               output_format: raw
 
 - job:
-    name: glance-multistore-cinder-import
+    name: glance-multistore-cinder
     parent: tempest-integrated-storage
     description: |
       The regular tempest-integrated-storage job but with multiple cinder
@@ -267,9 +267,10 @@
         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-import-fips
+    name: glance-multistore-cinder-fips
     parent: tempest-integrated-storage
     description: |
       The regular tempest-integrated-storage job but with multiple cinder
@@ -283,6 +284,7 @@
         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":
@@ -349,7 +351,7 @@
             irrelevant-files: *tempest-irrelevant-files
         - tempest-integrated-storage-import-standalone:
             irrelevant-files: *tempest-irrelevant-files
-        - glance-multistore-cinder-import:
+        - glance-multistore-cinder:
             irrelevant-files: *tempest-irrelevant-files
         - grenade:
             irrelevant-files: *tempest-irrelevant-files
@@ -388,7 +390,7 @@
         - grenade-multinode
         - tempest-pg-full:
             irrelevant-files: *tempest-irrelevant-files
-        - glance-multistore-cinder-import-fips:
+        - glance-multistore-cinder-fips:
             irrelevant-files: *tempest-irrelevant-files
     periodic:
       jobs:
@@ -432,5 +434,5 @@
             branches: master
         - glance-tox-functional-py36-cursive-tips:
             branches: master
-        - glance-multistore-cinder-import-fips:
+        - glance-multistore-cinder-fips:
             branches: master