From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Fri, 13 Apr 2018 01:18:11 +0000 (+0000)
Subject: Merge "[daisy] Move more CI resource to Fraser branch"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9c9a3734e4615088b812f92d37491cb38d792c89;hp=-c;p=releng.git

Merge "[daisy] Move more CI resource to Fraser branch"
---

9c9a3734e4615088b812f92d37491cb38d792c89
diff --combined jjb/daisy4nfv/daisy-daily-jobs.yml
index 0f2d917c3,7b186fdf8..eb3dcb746
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@@ -121,7 -121,6 +121,7 @@@
        - 'testapi-parameter'
        - 'daisy-project-parameter':
            gs-pathname: '{gs-pathname}'
 +      - 'deploy-scenario'
  
      builders:
        - description-setter:
@@@ -208,7 -207,6 +208,7 @@@
        - 'testapi-parameter'
        - 'daisy-project-parameter':
            gs-pathname: '{gs-pathname}'
 +      - 'deploy-scenario'
        - string:
            name: DEPLOY_TIMEOUT
            default: '150'
@@@ -242,7 -240,7 +242,7 @@@
  - trigger:
      name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
      triggers:
-       - timed: '0 12 * * *'
+       - timed: ''
  # Basic NOHA Scenarios
  - trigger:
      name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
@@@ -252,7 -250,7 +252,7 @@@
  - trigger:
      name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
      triggers:
-       - timed: '0 18 * * *'
+       - timed: ''
  # ovs_dpdk Scenarios
  - trigger:
      name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-master-trigger'
@@@ -290,7 -288,7 +290,7 @@@
  - trigger:
      name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
      triggers:
-       - timed: '0 0 * * *'
+       - timed: '0 0,6 * * *'
  # Basic NOHA Scenarios
  - trigger:
      name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
@@@ -300,7 -298,7 +300,7 @@@
  - trigger:
      name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
      triggers:
-       - timed: '0 20 * * *'
+       - timed: '0 12,18 * * *'
  # ovs_dpdk Scenarios
  - trigger:
      name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger'