diff options
Diffstat (limited to 'jjb/global')
| -rw-r--r-- | jjb/global/installer-params.yml | 4 | ||||
| -rw-r--r-- | jjb/global/releng-defaults.yml | 6 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 30 |
3 files changed, 18 insertions, 22 deletions
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index 610072d1b..4a50a5906 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -109,11 +109,11 @@ description: 'IP of the installer' - string: name: INSTALLER_TYPE - default: apex + default: netvirt description: 'Installer used for deploying OPNFV on this POD' - string: name: DEPLOY_SCENARIO - default: 'none' + default: 'os-odl_l2-bgpvpn-noha' description: 'Scenario to deploy and test' - string: name: EXTERNAL_NETWORK 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..cd92480d4 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -24,30 +24,30 @@ default: '{branch}' description: "JJB configured GERRIT_BRANCH parameter" +- wrapper: + name: ssh-agent-wrapper + wrappers: + - ssh-agent-credentials: + users: + - 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' + - 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' + refspec: '$GERRIT_REFSPEC' + <<: *git-scm-defaults - trigger: name: 'daily-trigger-disabled' |