X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=a0849463ab0a5b04a26372db83231e2ca8b39834;hb=7ed988259acc8820b8aafdf96c7d0a2f28e6d33c;hp=3cddd21ffbb17d43d4e28db7d58413a8cf294298;hpb=add65bec3bf6517e6ffd7eab66dc6dfa651cc5d3;p=ci-management.git diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 3cddd21ff..a0849463a 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -20,9 +20,6 @@ - master: branch: 'master' branch-id: 'oper' - - '1609': - branch: 'rls1609' - branch-id: 'oper-rls1609' stream: - master: branch: 'master' @@ -55,15 +52,13 @@ 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}' triggers: - gerrit-trigger-patch-submitted: @@ -105,15 +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: 1440 +##change build timeout behaviour to no-activity, 30 minutes + - build-no-activity-timeout: + build-timeout: 30 triggers: - gerrit-trigger-manually-triggered: @@ -289,14 +285,12 @@ 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' triggers: - timed: '0 4 * * 0' @@ -349,10 +343,8 @@ branch: '{branch}' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: 480 triggers: - timed: '0 4 * * 2,6' @@ -398,10 +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 * * *'