X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=95cb4765a147616ac117a261c683244b1363a090;hb=813d0c155a69285e0ee8f8f192869babb05d3b34;hp=e28f74431b9d39fe339188c168bf19f57cf0e91d;hpb=e49081701c022e5c0b6fb662a7911ef2e651f2c8;p=releng.git

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index e28f74431..95cb4765a 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -27,9 +27,9 @@
 
     phase:
       - 'build-x86_64':
-          slave-label: 'opnfv-build-ubuntu'
+          slave-label: 'doctor-{installer}-verify'
       - 'build-aarch64':
-          slave-label: 'opnfv-build-ubuntu-arm'
+          slave-label: 'doctor-{installer}-{phase}-verify'
 
     inspector:
       - 'sample'
@@ -38,10 +38,6 @@
     task:
       - verify:
           auto-trigger-name: 'doctor-verify'
-          is-python: false
-      - python-verify:
-          auto-trigger-name: 'doctor-verify'
-          is-python: true
 
     exclude:
       - installer: 'apex'
@@ -50,7 +46,7 @@
     jobs:
       - 'doctor-verify-{stream}'
       - 'doctor-verify-unit-test-{stream}'
-      - 'doctor-{task}-{installer}-{inspector}-{stream}'
+      - 'doctor-{task}-{inspector}-{stream}'
       - 'doctor-{task}-{installer}-{inspector}-{phase}-{stream}'
 
 - job-template:
@@ -133,26 +129,22 @@
     publishers:
       - 'doctor-verify-unit-test-publishers-macro'
 
-
 - job-template:
-    name: 'doctor-{task}-{installer}-{inspector}-{stream}'
+    name: 'doctor-{task}-{inspector}-{stream}'
 
     disabled: '{obj:disabled}'
 
     project-type: 'multijob'
 
-    node: '{slave-label}'
-
     parameters:
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
       - string:
           name: OS_CREDS
           default: /home/jenkins/openstack.creds
           description: 'OpenStack credentials'
-      - '{slave-label}-defaults'
-      - '{installer}-defaults'
       - string:
           name: DOCKER_TAG
           default: '{docker-tag}'
@@ -175,7 +167,7 @@
       - string:
           name: TESTCASE_OPTIONS
           # yamllint disable rule:line-length
-          default: '-e INSPECTOR_TYPE={inspector} -e PYTHON_ENABLE={is-python} -v $WORKSPACE:/home/opnfv/repos/doctor'
+          default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:/home/opnfv/repos/doctor'
           # yamllint enable rule:line-length
           description: 'Addtional parameters specific to test case(s)'
       # functest-parameter
@@ -214,17 +206,46 @@
          # in phase jobs
          echo "Triggering phase jobs!"
       - multijob:
-          name: 'doctor-verify-installer-inspector'
+          name: 'doctor-verify-apex-inspector'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-{task}-{installer}-{inspector}-build-x86_64-{stream}'
+            - name: 'doctor-{task}-apex-{inspector}-build-x86_64-{stream}'
               current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               git-revision: true
               node-parameters: false
               kill-phase-on: FAILURE
               abort-all-job: false
-            - name: 'doctor-{task}-{installer}-{inspector}-build-aarch64-{stream}'
+      - multijob:
+          name: 'doctor-verify-fuel-inspector'
+          execution-type: PARALLEL
+          projects:
+            - name: 'doctor-{task}-fuel-{inspector}-build-x86_64-{stream}'
               current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              git-revision: true
+              node-parameters: false
+              kill-phase-on: FAILURE
+              abort-all-job: false
+      - multijob:
+          name: 'doctor-verify-fuel-inspector'
+          execution-type: PARALLEL
+          projects:
+            - name: 'doctor-{task}-fuel-{inspector}-build-aarch64-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               git-revision: true
               node-parameters: false
               kill-phase-on: FAILURE
@@ -233,6 +254,7 @@
 - job-template:
     name: 'doctor-{task}-{installer}-{inspector}-{phase}-{stream}'
     disabled: '{obj:disabled}'
+    node: '{slave-label}'
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:
@@ -241,6 +263,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
+      - '{installer}-defaults'
       - '{slave-label}-defaults'
     scm:
       - git-scm-gerrit
@@ -255,7 +278,8 @@
 - builder:
     name: 'doctor-verify-unit-test-builders-macro'
     builders:
-      - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
+      - shell: "tox -e pep8"
+
 - builder:
     name: 'doctor-verify-installer-inspector-builders-macro'
     builders:
@@ -292,10 +316,14 @@
       - archive:
           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