From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Mon, 18 Jan 2016 08:58:46 +0000 (+0100)
Subject: joid: Move multijob to build node and get rid of duplicated parameter
X-Git-Tag: brahmaputra.1.0~171^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d6297d731df4ee327e91cb523b8dd1395098043d;p=releng.git

joid: Move multijob to build node and get rid of duplicated parameter

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

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 12a49f314..8023d4ba6 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -69,6 +69,8 @@
 
     project-type: multijob
 
+    node: intel-build
+
     concurrent: false
 
     properties:
@@ -103,21 +105,24 @@
             condition: SUCCESSFUL
             projects:
                 - name: 'joid-deploy-{pod}-daily-{stream}'
-                  current-parameters: true
+                  current-parameters: false
+                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
                   kill-phase-on: FAILURE
         - multijob:
             name: functest
             condition: COMPLETED
             projects:
                 - name: 'functest-joid-{pod}-daily-{stream}'
-                  current-parameters: true
+                  current-parameters: false
+                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
                   kill-phase-on: NEVER
         - multijob:
             name: yardstick
             condition: COMPLETED
             projects:
                 - name: 'yardstick-joid-{pod}-daily-{stream}'
-                  current-parameters: true
+                  current-parameters: false
+                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
                   kill-phase-on: NEVER
 
 - job-template:
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 986ecc081..9dd3d5406 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -61,10 +61,6 @@
             name: INSTALLER_TYPE
             default: joid
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
-            description: 'Scenario to deploy and test'
         - string:
             name: OS_RELEASE
             default: 'liberty'