summaryrefslogtreecommitdiffstats
path: root/jjb/releng
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2017-11-14 10:45:52 +0100
committerFatih Degirmenci <fdegir@gmail.com>2017-11-14 10:46:20 +0100
commitd888c77724fde742f453fa1c6a93c977237199c5 (patch)
tree284eabb9928abe6272cfb66e3088c186525c64cc /jjb/releng
parent8f2f9ca8772147b10e0386299876a97d833cc00e (diff)
functest: Fix slave label and parameters
Change-Id: I7fb73132f0ddb95345d2309263f9f22a66d6417e Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'jjb/releng')
-rw-r--r--jjb/releng/functest-docker.yml23
1 files changed, 21 insertions, 2 deletions
diff --git a/jjb/releng/functest-docker.yml b/jjb/releng/functest-docker.yml
index b90f029d3..ed6dfcecf 100644
--- a/jjb/releng/functest-docker.yml
+++ b/jjb/releng/functest-docker.yml
@@ -37,7 +37,7 @@
build-job-settings: &build-job-settings
current-parameters: false
git-revision: true
- node-parameters: true
+ node-parameters: false
predefined-parameters: |
PUSH_IMAGE=$PUSH_IMAGE
COMMIT_ID=$COMMIT_ID
@@ -50,7 +50,7 @@
manifest-job-settings: &manifest-job-settings
current-parameters: false
git-revision: true
- node-parameters: true
+ node-parameters: false
predefined-parameters: |
RELEASE_VERSION=$RELEASE_VERSION
ARCH_TAG=$ARCH_TAG
@@ -188,7 +188,26 @@
- job-template:
name: 'functest-{image}-manifest-{stream}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - label:
+ name: SLAVE_LABEL
+ default: 'opnfv-build-ubuntu'
+ description: 'Slave label on Jenkins'
+ - string:
+ name: PROJECT
+ default: "{project}"
+ description: "Project name used to enable job conditions"
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+
disabled: '{obj:disabled}'
+
builders:
- shell: |
#!/bin/bash -ex