X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yaml;h=c66624c14ac185fe8402ae1aeefdfe6412f55781;hb=b7871b1916fc8941c39950a9fb05308432a3a065;hp=b78bab1e25d8d29b579e5724ad65e8415a81d82d;hpb=10a5e72757214957dd4d01c9f9a38cea7948502f;p=releng.git

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index b78bab1e2..c66624c14 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -3,21 +3,24 @@
     name: doctor
 
     project: '{name}'
+    project-name: '{name}'
+    project-pattern: '{project}'
 
     stream:
       - master:
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - fraser: &fraser
+      - hunter:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
 
     installer:
-      - 'apex'
-      - 'fuel'
-      - 'daisy'
+      - 'apex':
+          scenario: 'os-nosdn-nofeature-noha'
+      - 'fuel':
+          scenario: 'os-nosdn-nofeature-noha'
 
     arch:
       - 'x86_64'
@@ -30,12 +33,6 @@
     exclude:
       - installer: 'apex'
         arch: 'aarch64'
-      - installer: 'daisy'
-        arch: 'aarch64'
-      # disabling the following tests due to limitation of PoD owners
-      # these would beenabled again once the PoDs are ready
-      - installer: 'fuel'
-        arch: 'x86_64'
 
     jobs:
       - 'doctor-verify-{stream}'
@@ -62,15 +59,15 @@
 
     builders:
       - shell: |
-         #!/bin/bash
-         # we do nothing here as the main stuff will be done
-         # in phase jobs
-         echo "Triggering phase jobs!"
+          #!/bin/bash
+          # we do nothing here as the main stuff will be done
+          # in phase jobs
+          echo "Triggering phase jobs!"
       - multijob:
           name: 'doctor-verify-sample'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-verify-fault_management-apex-sample-x86_64-{stream}'
+            - name: 'doctor-verify-all-apex-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -79,7 +76,7 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-            - name: 'doctor-verify-fault_management-daisy-sample-x86_64-{stream}'
+            - name: 'doctor-verify-fault_management-fuel-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -88,6 +85,10 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
+      - multijob:
+          name: 'doctor-verify-fenix'
+          execution-type: PARALLEL
+          projects:
             - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
@@ -110,14 +111,6 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-sample-all'
-          execution-type: PARALLEL
-          # This would be for running all test cases with sample inspector
-      - multijob:
-          name: 'doctor-verify-congress-all'
-          execution-type: PARALLEL
-          # This would be for running all test cases with congress inspector
 
 - job-template:
     name: 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}'
@@ -135,7 +128,9 @@
       - 'doctor-slave-parameter'
       - 'doctor-parameter':
           inspector: '{inspector}'
+          scenario: '{scenario}'
           test_case: 'fault_management'
+          admin_tool_type: 'sample'
     scm:
       - git-scm-gerrit
     builders:
@@ -146,7 +141,7 @@
 - job-template:
     name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}'
     disabled: '{obj:disabled}'
-    node: 'nokia-pod1'
+    node: 'doctor-{installer}-{arch}'
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:
@@ -159,7 +154,9 @@
       - 'doctor-slave-parameter'
       - 'doctor-parameter':
           inspector: '{inspector}'
+          scenario: '{scenario}'
           test_case: 'maintenance'
+          admin_tool_type: 'fenix'
     scm:
       - git-scm-gerrit
     builders:
@@ -170,7 +167,7 @@
 - job-template:
     name: 'doctor-verify-all-{installer}-{inspector}-{arch}-{stream}'
     disabled: '{obj:disabled}'
-    node: 'nokia-pod1'
+    node: 'doctor-{installer}-{arch}'
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:
@@ -183,7 +180,9 @@
       - 'doctor-slave-parameter'
       - 'doctor-parameter':
           inspector: '{inspector}'
+          scenario: '{scenario}'
           test_case: 'all'
+          admin_tool_type: 'sample'
     scm:
       - git-scm-gerrit
     builders:
@@ -206,6 +205,14 @@
           name: TEST_CASE
           default: '{test_case}'
           description: 'test case: all, fault_management or maintenance'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+          description: 'Scenario to deploy and test'
+      - string:
+          name: ADMIN_TOOL_TYPE
+          default: '{admin_tool_type}'
+          description: 'admin_tool_type: sample, fenix'
 
 
 # -------------------------------
@@ -216,17 +223,18 @@
     name: 'doctor-verify-installer-inspector-builders-macro'
     builders:
       # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ./doctor-env-presetup.sh
-              - ../../utils/fetch_os_creds.sh
+      - shell: !include-raw:
+          - ./doctor-env-presetup.sh
+          - ../../utils/fetch_os_creds.sh
       - shell: |
+          #!/bin/bash
+
           # prepare the env for test
-          source $HOME/opnfv-openrc.sh
+          . $HOME/opnfv-openrc.sh
           if [ -f $HOME/os_cacert ]; then
               export OS_CACERT=$HOME/os_cacert
           fi
-          source $HOME/opnfv-installer.sh
+          . $HOME/opnfv-installer.sh
 
           # run tox to trigger the test
           # As Jenkins user, it has no permission to send ICMP package