Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "No-activity timeout for csit-perf jobs"
[ci-management.git]
/
jjb
/
global-macros.yaml
diff --git
a/jjb/global-macros.yaml
b/jjb/global-macros.yaml
index
1745da0
..
caeb86c
100644
(file)
--- a/
jjb/global-macros.yaml
+++ b/
jjb/global-macros.yaml
@@
-102,6
+102,14
@@
timeout: 360
fail: true
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.
- wrapper:
# This wrapper is required for all jobs as it configures the wrappers
# needed by the fd.io infra.
@@
-112,6
+120,10
@@
timeout: '{build-timeout}'
timeout-var: 'BUILD_TIMEOUT'
fail: true
timeout: '{build-timeout}'
timeout-var: 'BUILD_TIMEOUT'
fail: true
+ - timestamps
+ - ssh-agent-credentials:
+ users:
+ - 'jenkins-gerrit-credentials'
- jclouds:
single-use: True
- jclouds:
single-use: True
@@
-250,4
+262,3
@@
variable: 'GLOBAL_SETTINGS_FILE'
- file-id: '{settings-file}'
variable: 'SETTINGS_FILE'
variable: 'GLOBAL_SETTINGS_FILE'
- file-id: '{settings-file}'
variable: 'SETTINGS_FILE'
-