diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-08-19 16:06:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-19 16:06:10 +0000 |
| commit | 0346c481830ea9c27e0de97d60f0556431cf3019 (patch) | |
| tree | 1577b5e9ed62f05cfe0c7bbd94cdde8804363e6e /jjb | |
| parent | 00b34a14cfa0121cf99ba1811b97b80f04e11056 (diff) | |
| parent | 75cf45350916064cc6ee78b11340a50ec62bc031 (diff) | |
Merge "armband: project: inherit {installer}-defaults"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/armband/armband-project-jobs.yml | 9 | ||||
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 20 |
2 files changed, 8 insertions, 21 deletions
diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml index 764a5d45b..46cc76b2a 100644 --- a/jjb/armband/armband-project-jobs.yml +++ b/jjb/armband/armband-project-jobs.yml @@ -7,6 +7,8 @@ project: '{name}' + installer: 'fuel' + jobs: - 'armband-verify-{stream}' - 'armband-build-daily-{stream}' @@ -77,6 +79,7 @@ - project-parameter: project: '{project}' - 'opnfv-build-arm-defaults' + - '{installer}-defaults' - armband-project-parameter: gs-pathname: '{gs-pathname}' @@ -103,7 +106,7 @@ publishers: - email: - recipients: josep.puigdemont@enea.com armband@enea.com + recipients: armband@enea.com ######################## # parameter macros @@ -116,6 +119,10 @@ default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." - string: + name: CACHE_DIRECTORY + default: $HOME/opnfv/cache/$INSTALLER_TYPE + description: "Directory where the cache to be used during the build is located." + - string: name: GS_URL default: artifacts.opnfv.org/$PROJECT{gs-pathname} description: "URL to Google Storage." diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index b7954086e..833a1d449 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -1,24 +1,4 @@ - parameter: - name: 'armband-defaults' - parameters: - - string: - name: INSTALLER_IP - default: '10.20.0.2' - description: 'IP of the installer' - - string: - name: INSTALLER_TYPE - default: fuel - description: 'Installer used for deploying OPNFV on this POD' - - string: - name: EXTERNAL_NETWORK - default: 'admin_floating_net' - description: 'external network for test' - - string: - name: BRIDGE - default: 'pxebr' - description: 'pxe bridge for booting of Fuel master' - -- parameter: name: 'apex-defaults' parameters: - string: |