diff options
Diffstat (limited to 'jjb/global')
| -rw-r--r-- | jjb/global/releng-defaults.yml | 6 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 33 |
2 files changed, 19 insertions, 20 deletions
diff --git a/jjb/global/releng-defaults.yml b/jjb/global/releng-defaults.yml index bf3330657..5003a8f48 100644 --- a/jjb/global/releng-defaults.yml +++ b/jjb/global/releng-defaults.yml @@ -9,13 +9,9 @@ artifactDaysToKeep: 30 artifactNumToKeep: 100 - ssh-credentials: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - ssh-agent-wrapper project-type: freestyle node: master - diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 3afd355e6..46f69b327 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -23,31 +23,34 @@ name: GERRIT_BRANCH default: '{branch}' description: "JJB configured GERRIT_BRANCH parameter" + - string: + name: SSH_CREDENTIAL_ID + default: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' + description: "SSH Credential ID for git access" + +- wrapper: + name: ssh-agent-wrapper + wrappers: + - ssh-agent-credentials: + users: + - '$SSH_CREDENTIAL_ID' - scm: name: git-scm scm: - - git: - credentials-id: '{credentials-id}' + - git: &git-scm-defaults + credentials-id: '$SSH_CREDENTIAL_ID' url: '$GIT_BASE' - refspec: '' branches: - - 'origin/{branch}' - skip-tag: true - wipe-workspace: true + - 'origin/$GERRIT_BRANCH' + timeout: 15 - scm: - name: gerrit-trigger-scm + name: git-scm-gerrit scm: - git: - credentials-id: '{credentials-id}' - url: '$GIT_BASE' - refspec: '{refspec}' - branches: - - 'origin/$GERRIT_BRANCH' - skip-tag: true - choosing-strategy: '{choosing-strategy}' - timeout: 15 + choosing-strategy: 'gerrit' + <<: *git-scm-defaults - trigger: name: 'daily-trigger-disabled' |