diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-18 16:44:58 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-19 15:50:42 +0200 |
| commit | 75cf45350916064cc6ee78b11340a50ec62bc031 (patch) | |
| tree | 86d1d2eed74feb5d43865f6372f2bcda8765ffd7 | |
| parent | 728a635ed2163a79f02406d77fba6ab26ebe9786 (diff) | |
armband: project: inherit {installer}-defaults
While at it, also do the following:
- revert previous addition of "armband-defaults" in
opnfv/installer-params.yml, no longer needed;
- remove Josep from failure mail recipient list, armband@enea.com
is already forwarded to all of us;
- add CACHE_DIRECTORY variable for enabling build cache;
TODO (left for future rework):
- rename build and deploy jobs to include installer info, e.g.
"armband-fuel-build-...", preparing for more installers;
- move "installer" parameter to fuel jobs only instead of having
it as a global param;
Change-Id: I2e6cc43484576bd6569605a7c9e60f6fe64f435b
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -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: |