[CI] Fix tempest-integrated-storage-import job

Test tempest.api.image.v2.admin.test_image_caching.ImageCachingTest is
also failing with a timeout in tempest-integrated-storage-import, like
in the glance-multistore-cinder-import job [1].

Move increased job timeout and Tempest image.build_timeout configuration
to tempest-integrated-storage-import, which is the parent of
glance-multistore-cinder-import.

[1] https://review.opendev.org/c/openstack/glance/+/939058

Change-Id: I0cbee8f687dbef5a9538629124b1caaed86435d3

Author: priteau

.zuul.yaml

@@ -209,6 +209,7 @@
 - job:
     name: tempest-integrated-storage-import
     parent: tempest-integrated-storage
+    timeout: 10800
     description: |
       The regular tempest-integrated-storage job but with glance metadata injection
     post-run: playbooks/post-check-metadata-injection.yaml
@@ -241,13 +242,13 @@
         test-config:
           "$TEMPEST_CONFIG":
             image:
-              image_caching_enabled: True
+              build_timeout: 600
               disk_formats: qcow2,ari,aki,vhd,vmdk,raw,ami,vdi,iso,vhdx
+              image_caching_enabled: True
 
 - job:
     name: glance-multistore-cinder-import
     parent: tempest-integrated-storage-import
-    timeout: 10800
     description: |
       The regular import workflow job to test with multiple cinder stores
     vars:
@@ -256,11 +257,6 @@
         GLANCE_ENABLE_MULTIPLE_STORES: True
         CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2
         GLANCE_CINDER_DEFAULT_BACKEND: lvmdriver-1
-      devstack_local_conf:
-        test-config:
-          "$TEMPEST_CONFIG":
-            image:
-              build_timeout: 600
 
 - job:
     name: tempest-integrated-storage-import-standalone