[doctor] remove needless `'`

[releng.git] / jjb / doctor / doctor.yml

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 2d0bbfb..8498702 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -18,6 +18,7 @@
     installer:
         - apex:
             slave-label: 'ool-virtual1'
+            pod: 'ool-virtual1'
 
     inspector:
         - sample
@@ -73,6 +74,8 @@
 - job-template:
     name: 'doctor-verify-{installer}-{inspector}-{stream}'
 
+    node: '{slave-label}'
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -82,26 +85,11 @@
             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'
-        - 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:
@@ -137,5 +125,11 @@
                 notbuilt: true
 
     builders:
-        - 'functest-suite-builder':
-            TESTCASE_OPTIONS: '-e INSPECTOR_TYPE=$INSPECTOR_TYPE -v $WORKSPACE:$HOME/opnfv/repos/doctor'
+        - trigger-builds:
+          - project: 'functest-{installer}-{pod}-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