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
/
csit
/
csit.yaml
diff --git
a/jjb/csit/csit.yaml
b/jjb/csit/csit.yaml
index
3cddd21
..
a084946
100644
(file)
--- a/
jjb/csit/csit.yaml
+++ b/
jjb/csit/csit.yaml
@@
-20,9
+20,6
@@
- master:
branch: 'master'
branch-id: 'oper'
- master:
branch: 'master'
branch-id: 'oper'
- - '1609':
- branch: 'rls1609'
- branch-id: 'oper-rls1609'
stream:
- master:
branch: 'master'
stream:
- master:
branch: 'master'
@@
-55,15
+52,13
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
@@
-105,15
+100,16
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
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: 30
triggers:
- gerrit-trigger-manually-triggered:
triggers:
- gerrit-trigger-manually-triggered:
@@
-289,14
+285,12
@@
scm:
- git-scm:
scm:
- git-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
branch: '{branch}'
wrappers:
branch: '{branch}'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '480'
triggers:
- timed: '0 4 * * 0'
triggers:
- timed: '0 4 * * 0'
@@
-349,10
+343,8
@@
branch: '{branch}'
wrappers:
branch: '{branch}'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: 480
triggers:
- timed: '0 4 * * 2,6'
triggers:
- timed: '0 4 * * 2,6'
@@
-398,10
+390,11
@@
branch: '{branch}'
wrappers:
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 * * *'
triggers:
- timed: '0 20 * * *'