X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=7ddc89846158b6423c7b63198629c172519db4d2;hb=21316a6aa857071e89e4d512613a785eddac2ae5;hp=e0fb835bbeeba0f7b31ae17bdde600ac6770419c;hpb=683c376d67b1499fa5b22f46b39c3f3776d3a003;p=ci-management.git diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index e0fb835bb..7ddc89846 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,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}' @@ -107,15 +100,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: 1400 @@ -293,14 +282,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' @@ -355,10 +340,6 @@ branch: '{branch}' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: 480 @@ -406,10 +387,6 @@ branch: '{branch}' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '1440'