From 75cf45350916064cc6ee78b11340a50ec62bc031 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 18 Aug 2016 16:44:58 +0200
Subject: 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>
---
 jjb/armband/armband-project-jobs.yml |  9 ++++++++-
 jjb/opnfv/installer-params.yml       | 20 --------------------
 2 files changed, 8 insertions(+), 21 deletions(-)

(limited to 'jjb')

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
@@ -115,6 +118,10 @@
             name: BUILD_DIRECTORY
             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}
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,23 +1,3 @@
-- 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:
-- 
cgit 1.2.3-korg