Merge "No-activity timeout for csit-perf jobs"

diff --cc jjb/csit/csit.yaml
index 7ddc898,f8d6736..a084946
--- 1/jjb/csit/csit.yaml
--- 2/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@@ -105,8 -109,15 +105,11 @@@
              choosing-strategy: 'gerrit'
  
      wrappers:
 -        - timestamps
 -        - ssh-agent-credentials:
 -            users:
 -                - '{ssh-credentials}'
          - fdio-infra-wrappers:
-             build-timeout: 1400
+             build-timeout: 1440
+ ##change build timeout behaviour to no-activity, 30 minutes
+         - build-no-activity-timeout:
+             build-timeout: 30
  
      triggers:
          - gerrit-trigger-manually-triggered:
@@@ -387,8 -406,15 +390,11 @@@
              branch: '{branch}'
  
      wrappers:
 -        - timestamps
 -        - ssh-agent-credentials:
 -            users:
 -                - '{ssh-credentials}'
          - fdio-infra-wrappers:
              build-timeout: '1440'
+ ##change build timeout behaviour to no-activity, 30 minutes
+         - build-no-activity-timeout:
+             build-timeout: '1440'
  
      triggers:
          - timed: '0 20 * * *'

diff --cc jjb/global-macros.yaml
Simple merge