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

diff --combined jjb/csit/csit.yaml
index 7ddc898,f8d6736..a084946
--- 1/jjb/csit/csit.yaml
--- 2/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@@ -52,11 -52,15 +52,11 @@@
  
      scm:
          - gerrit-trigger-scm:
 -            credentials-id: '{ssh-credentials}'
 +            credentials-id: 'jenkins-gerrit-credentials'
              refspec: '$GERRIT_REFSPEC'
              choosing-strategy: 'gerrit'
  
      wrappers:
 -        - timestamps
 -        - ssh-agent-credentials:
 -            users:
 -                - '{ssh-credentials}'
          - fdio-infra-wrappers:
              build-timeout: '{build-timeout}'
  
@@@ -100,13 -104,20 +100,16 @@@
  
      scm:
          - gerrit-trigger-scm:
 -            credentials-id: '{ssh-credentials}'
 +            credentials-id: 'jenkins-gerrit-credentials'
              refspec: '$GERRIT_REFSPEC'
              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:
@@@ -282,10 -293,14 +285,10 @@@
  
      scm:
          - git-scm:
 -            credentials-id: '{ssh-credentials}'
 +            credentials-id: 'jenkins-gerrit-credentials'
              branch: '{branch}'
  
      wrappers:
 -        - timestamps
 -        - ssh-agent-credentials:
 -            users:
 -                - '{ssh-credentials}'
          - fdio-infra-wrappers:
              build-timeout: '480'
  
@@@ -340,6 -355,10 +343,6 @@@
              branch: '{branch}'
  
      wrappers:
 -        - timestamps
 -        - ssh-agent-credentials:
 -            users:
 -                - '{ssh-credentials}'
          - fdio-infra-wrappers:
              build-timeout: 480
  
@@@ -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 --combined jjb/global-macros.yaml
index b5b0e1f,4890626..caeb86c
--- 1/jjb/global-macros.yaml
--- 2/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@@ -102,6 -102,14 +102,14 @@@
              timeout: 360
              fail: true
  
+ - wrapper:
+     name: build-no-activity-timeout
+     wrappers:
+         - timeout:
+             type: no-activity
+             timeout: '{build-timeout}'
+             fail: true
+ 
  - wrapper:
      # This wrapper is required for all jobs as it configures the wrappers
      # needed by the fd.io infra.
@@@ -112,10 -120,6 +120,10 @@@
            timeout: '{build-timeout}'
            timeout-var: 'BUILD_TIMEOUT'
            fail: true
 +      - timestamps
 +      - ssh-agent-credentials:
 +          users:
 +              - 'jenkins-gerrit-credentials'
        - jclouds:
            single-use: True
  
@@@ -254,3 -258,4 +262,3 @@@
                    variable: 'GLOBAL_SETTINGS_FILE'
                  - file-id: '{settings-file}'
                    variable: 'SETTINGS_FILE'
 -