[doctor] merge doctor verify jobs

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

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 2d0bbfb..2010e12 100644 (file)
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -18,14 +18,11 @@
     installer:
         - apex:
             slave-label: 'ool-virtual1'
-
-    inspector:
-        - sample
-        - congress
+            pod: 'ool-virtual1'
 
     jobs:
         - 'doctor-verify-{stream}'
-        - 'doctor-verify-{installer}-{inspector}-{stream}'
+        - 'doctor-verify-{installer}-{stream}'
 
 - job-template:
     name: 'doctor-verify-{stream}'
@@ -71,37 +68,20 @@
         - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
 
 - job-template:
-    name: 'doctor-verify-{installer}-{inspector}-{stream}'
+    name: 'doctor-verify-{installer}-{stream}'
+
+    node: '{slave-label}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - string:
-            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 +117,22 @@
                 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: |
+              CI_DEBUG=true
+              FUNCTEST_SUITE_NAME=doctor
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              TESTCASE_OPTIONS=-e INSPECTOR_TYPE=sample -v $WORKSPACE:$HOME/opnfv/repos/doctor
+            block: true
+            same-node: true
+          - project: 'functest-{installer}-{pod}-suite-{stream}'
+            current-parameters: true
+            predefined-parameters: |
+              CI_DEBUG=true
+              FUNCTEST_SUITE_NAME=doctor
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              TESTCASE_OPTIONS=-e INSPECTOR_TYPE=congress -v $WORKSPACE:$HOME/opnfv/repos/doctor
+            block: true
+            same-node: true