Merge "Add soft timeout to Swift functional tests"

modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml

@@ -4,7 +4,7 @@
 
     wrappers:
       - timeout:
-          timeout: 125
+          timeout: 95
           fail: true
       - timestamps
 
@@ -13,7 +13,8 @@
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_TIMEOUT=90
+          export FUNCTEST_TIMEOUT=30
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_EXERCISES=0
           export BRANCH_OVERRIDE={branch-override}
@@ -24,9 +25,9 @@
           function post_test_hook {{
               cd /opt/stack/new/swift
               # Launch V2 auth tests and v1 tests after.
-              bash .functests --verbosity=3 && \
+              timeout -s 9 ${{FUNCTEST_TIMEOUT}}m bash .functests --verbosity=3 && \
                   SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \
-                      bash .functests --verbosity=3
+                      timeout -s 9 ${{FUNCTEST_TIMEOUT}}m bash .functests --verbosity=3
           }}
           export -f post_test_hook
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh