From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 14 Nov 2017 09:45:52 +0000 (+0100)
Subject: functest: Fix slave label and parameters
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d888c77724fde742f453fa1c6a93c977237199c5;p=releng.git

functest: Fix slave label and parameters

Change-Id: I7fb73132f0ddb95345d2309263f9f22a66d6417e
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
---

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