From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Wed, 20 Apr 2016 14:18:45 +0000 (+0200)
Subject: armband: Small adjustments to align with the rest
X-Git-Tag: colorado.1.0~566
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F12489%2F2;p=releng.git

armband: Small adjustments to align with the rest

Change-Id: Icf15d27605848b143d75a750d45006dbcfc638ff
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---

diff --git a/jjb/armband/armband.yml b/jjb/armband/armband-project-jobs.yml
similarity index 81%
rename from jjb/armband/armband.yml
rename to jjb/armband/armband-project-jobs.yml
index 61073c166..f91e9b1ea 100644
--- a/jjb/armband/armband.yml
+++ b/jjb/armband/armband-project-jobs.yml
@@ -76,12 +76,8 @@
         - project-parameter:
             project: '{project}'
         - 'arm-build1-defaults'
-        - choice:
-            name: FORCE_BUILD
-            choices:
-                - 'false'
-                - 'true'
-            description: 'Force build even if there are no changes in the armband repo. Default false'
+        - armband-project-parameter:
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
@@ -100,8 +96,29 @@
 
     builders:
         - shell:
-            !include-raw-escape: ./armband-build.sh
+            !include-raw-escape: ./build.sh
 
     publishers:
         - email:
             recipients: josep.puigdemont@enea.com armband@enea.com
+
+########################
+# parameter macros
+########################
+- parameter:
+    name: armband-project-parameter
+    parameters:
+        - string:
+            name: BUILD_DIRECTORY
+            default: $WORKSPACE/build_output
+            description: "Directory where the build artifact will be located upon the completion of the build."
+        - string:
+            name: GS_URL
+            default: artifacts.opnfv.org/$PROJECT{gs-pathname}
+            description: "URL to Google Storage."
+        - choice:
+            name: FORCE_BUILD
+            choices:
+                - 'false'
+                - 'true'
+            description: 'Force build even if there are no changes in the armband repo. Default false'
diff --git a/jjb/armband/armband-build.sh b/jjb/armband/build.sh
similarity index 100%
rename from jjb/armband/armband-build.sh
rename to jjb/armband/build.sh