Merge "add another ovs_dpdk scenarios trigers"

diff --combined jjb/daisy4nfv/daisy-daily-jobs.yml
index 043e40f,6b10693..453451f
--- 1/jjb/daisy4nfv/daisy-daily-jobs.yml
--- 2/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@@ -117,7 -117,18 +117,7 @@@
        - '{installer}-defaults'
        - '{slave-label}-defaults':
            installer: '{installer}'
 -      - string:
 -          name: DEPLOY_SCENARIO
 -          default: '{scenario}'
 -      - string:
 -          name: INSTALLER_VERSION
 -          default: ''
 -      - string:
 -          name: UPSTREAM_JOB_NAME
 -          default: ''
 -      - string:
 -          name: UPSTREAM_BUILD_ID
 -          default: ''
 +      - 'testapi-parameter'
        - 'daisy-project-parameter':
            gs-pathname: '{gs-pathname}'
  
@@@ -190,10 -201,8 +190,10 @@@
        - build-blocker:
            use-build-blocker: true
            blocking-jobs:
 -            - 'daisy.*-deploy-({pod})?-daily-.*'
              - 'daisy-kolla-build-.*'
 +            - '{installer}-daily-(build|deploy|test)-(euphrates|master)'
 +            - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
 +            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
            block-level: 'NODE'
  
      parameters:
@@@ -203,7 -212,9 +203,7 @@@
        - '{installer}-defaults'
        - '{slave-label}-defaults':
            installer: '{installer}'
 -      - string:
 -          name: DEPLOY_SCENARIO
 -          default: 'os-nosdn-nofeature-ha'
 +      - 'testapi-parameter'
        - 'daisy-project-parameter':
            gs-pathname: '{gs-pathname}'
        - string:
@@@ -335,7 -346,7 +335,7 @@@
  - trigger:
      name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger'
      triggers:
-       - timed: '0 10 * * *'
+       - timed: '0 10,20 * * *'
  # Basic HA Scenarios
  - trigger:
      name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger'