1 files changed, 1 insertions, 89 deletions

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 730c7fcb1..c3760a739 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -36,86 +36,10 @@
         arch: 'aarch64'
 
     jobs:
-      - 'doctor-verify-{stream}'
-      - 'doctor-verify-unit-test-{stream}'
       - 'doctor-verify-{inspector}-{stream}'
       - 'doctor-verify-{installer}-{inspector}-{arch}-{stream}'
 
 - job-template:
-    name: 'doctor-verify-{stream}'
-    disabled: '{obj:disabled}'
-    project-type: 'multijob'
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-    scm:
-      - git-scm-gerrit
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'doctor_tests/**'
-
-    builders:
-      - shell: |
-         #!/bin/bash
-         # we do nothing here as the main stuff will be done
-         # in phase jobs
-         echo "Triggering phase jobs!"
-      - multijob:
-          name: 'doctor-build-and-unittest'
-          execution-type: PARALLEL
-          projects:
-            - name: 'doctor-verify-unit-test-{stream}'
-              predefined-parameters: |
-                PROJECT=$PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              kill-phase-on: FAILURE
-              current-parameters: true
-              git-revision: true
-
-- job-template:
-    name: 'doctor-verify-unit-test-{stream}'
-    disabled: '{obj:disabled}'
-    wrappers:
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 60
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-    scm:
-      - git-scm-gerrit
-    builders:
-      - 'doctor-verify-unit-test-builders-macro'
-    publishers:
-      - 'doctor-verify-unit-test-publishers-macro'
-
-- job-template:
     name: 'doctor-verify-{inspector}-{stream}'
     disabled: '{obj:disabled}'
     project-type: 'multijob'
@@ -123,7 +47,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
+      - 'doctor-slave-parameter'
     scm:
       - git-scm-gerrit
     triggers:
@@ -281,11 +205,6 @@
 # -------------------------------
 
 - builder:
-    name: 'doctor-verify-unit-test-builders-macro'
-    builders:
-      - shell: "tox -e pep8"
-
-- builder:
     name: 'doctor-verify-installer-inspector-builders-macro'
     builders:
       - 'clean-workspace-log'
@@ -322,13 +241,6 @@
           artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log'
       - email-jenkins-admins-on-failure
 
-- publisher:
-    name: 'doctor-verify-unit-test-publishers-macro'
-    publishers:
-      - email-jenkins-admins-on-failure
-      - archive:
-          artifacts: '.tox/'
-
 
 #####################################
 # trigger macros