X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=5732100be56a76262c45a85c90b8e923123d5905;hb=859c955553ac60a7fcd1af12e72031db20bbaf6a;hp=ba76b8abb9ded0dcdd8b8130400f6dc7bdf8d4c8;hpb=948679062e550b501d0a04cce9aaab24d11a7112;p=releng.git

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index ba76b8abb..5732100be 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -10,16 +10,21 @@
           gs-pathname: ''
           docker-tag: 'latest'
           disabled: false
-      - euphrates:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           docker-tag: 'stable'
           disabled: false
 
+    # feature projects' tests are not triggered by functest
+    # doctor verify Pods need to deploy with these scenario
     installer:
-      - 'apex'
-      - 'fuel'
-    # - 'joid'
+      - 'apex':
+          scenario: 'os-nosdn-kvm-ha'
+      - 'fuel':
+          scenario: 'os-nosdn-ovs-ha'
+      - 'daisy':
+          scenario: 'os-nosdn-ovs_dpdk-noha'
 
     arch:
       - 'x86_64'
@@ -29,53 +34,33 @@
       - 'sample'
       - 'congress'
 
-    task:
-      - verify:
-          auto-trigger-name: 'doctor-verify'
-
     exclude:
       - installer: 'apex'
         arch: 'aarch64'
+      - installer: 'daisy'
+        arch: 'aarch64'
 
     jobs:
-      - 'doctor-verify-{stream}'
-      - 'doctor-verify-unit-test-{stream}'
-      - 'doctor-{task}-{inspector}-{stream}'
-      - 'doctor-{task}-{installer}-{inspector}-{arch}-{stream}'
+      - 'doctor-verify-{inspector}-{stream}'
+      - 'doctor-verify-{installer}-{inspector}-{arch}-{stream}'
 
 - job-template:
-    name: 'doctor-verify-{stream}'
+    name: 'doctor-verify-{inspector}-{stream}'
     disabled: '{obj:disabled}'
     project-type: 'multijob'
     parameters:
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
+      - 'doctor-slave-parameter'
     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/**'
+      - 'doctor-verify':
+          project: '{project}'
+          branch: '{branch}'
+          files: 'doctor_tests/**'
+
     builders:
       - shell: |
          #!/bin/bash
@@ -83,10 +68,10 @@
          # in phase jobs
          echo "Triggering phase jobs!"
       - multijob:
-          name: 'doctor-build-and-unittest'
+          name: 'doctor-verify'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-verify-unit-test-{stream}'
+            - name: 'doctor-verify-apex-{inspector}-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -94,50 +79,8 @@
                 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-{task}-{inspector}-{stream}'
-    disabled: '{obj:disabled}'
-    project-type: 'multijob'
-    scm:
-      - git-scm-gerrit
-    triggers:
-      - '{auto-trigger-name}':
-          project: '{project}'
-          branch: '{branch}'
-          files: '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-verify-apex-inspector'
-          execution-type: PARALLEL
-          projects:
-            - name: 'doctor-{task}-apex-{inspector}-x86_64-{stream}'
+            - name: 'doctor-verify-fuel-{inspector}-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -145,27 +88,16 @@
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
-              current-parameters: true
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-fuel-inspector'
-          execution-type: PARALLEL
-          projects:
-            - name: 'doctor-{task}-fuel-{inspector}-x86_64-{stream}'
+            - name: 'doctor-verify-fuel-{inspector}-aarch64-{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
-      - multijob:
-          name: 'doctor-verify-fuel-inspector'
-          execution-type: PARALLEL
-          projects:
-            - name: 'doctor-{task}-fuel-{inspector}-aarch64-{stream}'
+            - name: 'doctor-verify-daisy-{inspector}-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -173,11 +105,10 @@
                 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-{task}-{installer}-{inspector}-{arch}-{stream}'
+    name: 'doctor-verify-{installer}-{inspector}-{arch}-{stream}'
     disabled: '{obj:disabled}'
     node: 'doctor-{installer}-{arch}'
     wrappers:
@@ -220,7 +151,7 @@
           description: 'Remove downloaded docker images (opnfv/functest:*)'
       - string:
           name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
+          default: '{scenario}'
           description: 'Scenario to deploy and test'
 
 - parameter:
@@ -262,11 +193,6 @@
 # builder macros
 # -------------------------------
 
-- builder:
-    name: 'doctor-verify-unit-test-builders-macro'
-    builders:
-      - shell: "tox -e pep8"
-
 - builder:
     name: 'doctor-verify-installer-inspector-builders-macro'
     builders:
@@ -304,13 +230,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