Merge "Increase timeout value for ironic-base job"

zuul.d/ironic-jobs.yaml

@@ -33,13 +33,13 @@
         FORCE_CONFIG_DRIVE: True
         INSTALL_TEMPEST: False # Don't install a tempest package globaly
         VIRT_DRIVER: ironic
-        BUILD_TIMEOUT: 720
+        BUILD_TIMEOUT: 900
         IRONIC_BAREMETAL_BASIC_OPS: True
         IRONIC_BUILD_DEPLOY_RAMDISK: False
         IRONIC_CALLBACK_TIMEOUT: 600
         IRONIC_DEPLOY_DRIVER: ipmi
         IRONIC_INSPECTOR_BUILD_RAMDISK: False
-        IRONIC_TEMPEST_BUILD_TIMEOUT: 720
+        IRONIC_TEMPEST_BUILD_TIMEOUT: 900
         IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False
         IRONIC_VM_COUNT: 1
         IRONIC_VM_EPHEMERAL_DISK: 1
@@ -244,8 +244,6 @@
       # Excluding the abort tests since it hits "node locked" too often.
       tempest_test_regex: test_baremetal_introspection
       devstack_localrc:
-        BUILD_TIMEOUT: 900
-        IRONIC_TEMPEST_BUILD_TIMEOUT: 900
         IRONIC_BOOT_MODE: bios
         IRONIC_INSPECTOR_MANAGED_BOOT: True
         IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK: ''
@@ -328,12 +326,6 @@
     timeout: 5400
     vars:
       devstack_localrc:
-        # This test runs cleaning by default, and with a larger
-        # IPA image means that it takes longer to boot for deploy
-        # and cleaning. As such, CI performance variations can
-        # cause this job to fail easily due to the extra steps
-        # and boot cycle of the cleaning operation.
-        IRONIC_TEMPEST_BUILD_TIMEOUT: 850
         IRONIC_DEFAULT_BOOT_OPTION: netboot
 
 - job:
@@ -684,7 +676,6 @@
         IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
         IRONIC_DIB_RAMDISK_OS: centos8
         IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
-        IRONIC_TEMPEST_BUILD_TIMEOUT: 900
         IRONIC_VM_EPHEMERAL_DISK: 0
         IRONIC_VM_INTERFACE_COUNT: 1
         IRONIC_AUTOMATED_CLEAN_ENABLED: False