Merge "Set distro-check job time limit to 60 minutes"

diff --combined jjb/releng-templates-java.yaml
index 4e105f8228b15eef92648fbb3f286c547a77f1e8,2903cc66972f5c64c4f854b7ee08072c51288337..acae5f121af2efc7c70447d1d17bf5ed2cb66c6d
--- 1/jjb/releng-templates-java.yaml
--- 2/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@@ -164,7 -164,11 +164,11 @@@
  
      wrappers:
          - opendaylight-infra-wrappers:
-             build-timeout: '{build-timeout}'
+             # Distro-check jobs typically run within 10 - 30 minutes
+             # with 45 minutes being the occassional edge case.
+             # enforce a 60 minute limit to ensure stuck jobs get
+             # cleared up sooner.
+             build-timeout: '60'
  
      triggers:
          - gerrit:
@@@ -173,10 -177,12 +177,10 @@@
                  - patchset-created-event:
                      exclude-drafts: 'true'
                      exclude-trivial-rebase: 'false'
 -                    exclude-no-code-change: 'false'
 +                    exclude-no-code-change: 'true'
                  - draft-published-event
                  - comment-added-contains-event:
 -                    comment-contains-value: 'test-distribution'
 -                - comment-added-contains-event:
 -                    comment-contains-value: 'reverify'
 +                    comment-contains-value: 'redistcheck'
                  - comment-added-contains-event:
                      comment-contains-value: 'recheck'
              projects:
@@@ -595,6 -601,8 +599,6 @@@
                  - draft-published-event
                  - comment-added-contains-event:
                      comment-contains-value: 'recheck'
 -                - comment-added-contains-event:
 -                    comment-contains-value: 'reverify'
                  - comment-added-contains-event:
                      comment-contains-value: 'revalidate'
              projects: