From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Mon, 19 Sep 2016 02:22:26 +0000 (+0000)
Subject: Merge "doctor: use trigger-builders to override param"
X-Git-Tag: colorado.1.0~20
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c5a5ac59a33dacaaf47b210aee42c75f4459b273;hp=3c11732847926c7b8be63cf1140d415d935cd56c;p=releng.git

Merge "doctor: use trigger-builders to override param"
---

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index b53082eb5..fcbd1b0e7 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -82,28 +82,10 @@
             name: INSPECTOR_TYPE
             default: '{inspector}'
             description: 'Doctor inspector type to be used'
-        - string:
-            name: INSTALLER_TYPE
-            default: apex
-            description: 'OPNFV Installer type'
         - string:
             name: OS_CREDS
             default: /home/jenkins/openstack.creds
             description: 'OpenStack credentials'
-        - '{installer}-defaults'
-        - '{slave-label}-defaults'
-        - 'functest-suite-parameter':
-            FUNCTEST_SUITE_NAME: '{project}'
-            TESTCASE_OPTIONS: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/{project}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-odl_l2-nofeature-ha'
-        - string:
-            name: DOCKER_TAG
-            default: '{docker_tag}'
-            description: 'Tag to pull docker image'
-        - functest-parameter:
-            gs-pathname: '{gs-pathname}'
 
     scm:
         - gerrit-trigger-scm:
@@ -139,4 +121,11 @@
                 notbuilt: true
 
     builders:
-        - 'functest-suite-builder'
+        - trigger-builds:
+          - project: 'functest-{installer}-virtual-suite-{stream}'
+            current-parameters: true
+            predefined-parameters: |
+              FUNCTEST_SUITE_NAME=doctor
+              TESTCASE_OPTIONS='-e INSPECTOR_TYPE=$INSPECTOR_TYPE -v $WORKSPACE:$HOME/opnfv/repos/doctor'
+            block: true
+            same-node: true