summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-04-20 16:18:45 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-04-20 16:19:35 +0200
commit224643700b04c06d766096c6bb1d0564284ddd9f (patch)
treef715e135487d49aaea17ed618cc42efd63756a3f
parent117d9d72df6f9a93099328e412d5470b0c99d982 (diff)
armband: Small adjustments to align with the rest
Change-Id: Icf15d27605848b143d75a750d45006dbcfc638ff Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/armband/armband-project-jobs.yml (renamed from jjb/armband/armband.yml)31
-rwxr-xr-xjjb/armband/build.sh (renamed from jjb/armband/armband-build.sh)0
2 files changed, 24 insertions, 7 deletions
diff --git a/jjb/armband/armband.yml b/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
index 81917f6de..81917f6de 100755
--- a/jjb/armband/armband-build.sh
+++ b/jjb/armband/build.sh