diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-09-06 23:20:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-06 23:20:02 +0000 |
| commit | 1a0bb353fb9bea009efed9c0f3863cee35949b58 (patch) | |
| tree | 1ab413f62cb393f78deee6852cd8afb1b8ad27b6 /jjb/global | |
| parent | a199806d77fc35744a3222be208302b4da825d2b (diff) | |
| parent | a310e1e2a02bb6a3a1ecd284f8b20864637a6df1 (diff) | |
Merge changes from topic 'fuel-armband-verify-sync'
* changes:
fuel, armband: Move GS_URL to installer params
fuel, armband: Move SSH_KEY outside /tmp
fuel, armband: verify jobs: Enable virtual deploy
Diffstat (limited to 'jjb/global')
| -rw-r--r-- | jjb/global/installer-params.yml | 6 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 15 |
2 files changed, 5 insertions, 16 deletions
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index 10afd6f8c..ecef6d3b7 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -44,7 +44,7 @@ description: 'IP of the salt master (for mcp deployments)' - string: name: SSH_KEY - default: '/tmp/mcp.rsa' + default: "$HOME/opnfv/mcp.rsa" description: 'Path to private SSH key to access environment nodes' - string: name: INSTALLER_TYPE @@ -58,6 +58,10 @@ name: BRIDGE default: 'pxebr' description: 'Bridge(s) to be used by salt master' + - string: + name: GS_URL + default: '$GS_BASE{gs-pathname}' + description: "URL to Google Storage." - parameter: name: 'joid-defaults' diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 75c4323e6..a4ee4d9f1 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -364,21 +364,6 @@ # Parameters for build slaves ##################################################### - parameter: - name: 'opnfv-build-enea-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'opnfv-build-enea' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - -- parameter: name: 'opnfv-build-centos-defaults' parameters: - label: |