remove Daisy installer for doctor test

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

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 1ebd22d..deccc32 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -23,7 +23,6 @@
     installer:
       - 'apex'
       - 'fuel'
-      - 'daisy'
 
     arch:
       - 'x86_64'
@@ -36,12 +35,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}'
@@ -76,7 +69,16 @@
           name: 'doctor-verify-sample'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-verify-fault_management-daisy-sample-x86_64-{stream}'
+            - name: 'doctor-verify-all-apex-sample-x86_64-{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
+              git-revision: true
+            - name: 'doctor-verify-fault_management-fuel-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -85,18 +87,6 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-            - name: 'doctor-verify-sample-all'
-              execution-type: PARALLEL
-              projects:
-                - name: 'doctor-verify-all-apex-sample-x86_64-{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
-                  git-revision: true
       - multijob:
           name: 'doctor-verify-congress'
           execution-type: PARALLEL