Merge "[daisy] Fix the scenario in build-name"

diff --combined jjb/daisy4nfv/daisy-daily-jobs.yml
index ac17281,e04df12..593d21a
--- 1/jjb/daisy4nfv/daisy-daily-jobs.yml
--- 2/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@@ -48,12 -48,9 +48,12 @@@
        # -------------------------------
        #        None-CI PODs
        # -------------------------------
 -      # - baremetal:
 -      #     slave-label: zte-pod3
 -      #     <<: *master
 +      - zte-pod3:
 +          slave-label: zte-pod3
 +          <<: *master
 +      - zte-pod3:
 +          slave-label: zte-pod3
 +          <<: *fraser
        - zte-pod9:
            slave-label: zte-pod9
            <<: *master
@@@ -124,7 -121,9 +124,9 @@@
        - 'testapi-parameter'
        - 'daisy-project-parameter':
            gs-pathname: '{gs-pathname}'
-       - 'deploy-scenario'
+       - string:
+           name: DEPLOY_SCENARIO
+           default: '{scenario}'
  
      builders:
        - description-setter:
@@@ -194,8 -193,8 +196,8 @@@
            blocking-jobs:
              - 'daisy-kolla-build-.*'
              - '{installer}-(build|deploy|test)-daily-(fraser|master)'
 -            - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
 -            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
 +            - '{installer}-deploy-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
 +            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
            block-level: 'NODE'
  
      parameters:
@@@ -331,54 -330,6 +333,54 @@@
      triggers:
        - timed: ''
  
 +# ----------------------------------------------
 +# Triggers for job running on zte-pod3 against master branch
 +# ----------------------------------------------
 +# Basic HA Scenarios
 +- trigger:
 +    name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-master-trigger'
 +    triggers:
 +      - timed: ''
 +# Basic NOHA Scenarios
 +- trigger:
 +    name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-master-trigger'
 +    triggers:
 +      - timed: ''
 +# ODL Scenarios
 +- trigger:
 +    name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-master-trigger'
 +    triggers:
 +      - timed: ''
 +# ovs_dpdk Scenarios
 +- trigger:
 +    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-master-trigger'
 +    triggers:
 +      - timed: ''
 +
 +# ----------------------------------------------
 +# Triggers for job running on zte-pod3 against fraser branch
 +# ----------------------------------------------
 +# Basic HA Scenarios
 +- trigger:
 +    name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-fraser-trigger'
 +    triggers:
 +      - timed: ''
 +# Basic NOHA Scenarios
 +- trigger:
 +    name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-fraser-trigger'
 +    triggers:
 +      - timed: ''
 +# ODL Scenarios
 +- trigger:
 +    name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-fraser-trigger'
 +    triggers:
 +      - timed: '0 16,22 * * *'
 +# ovs_dpdk Scenarios
 +- trigger:
 +    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-fraser-trigger'
 +    triggers:
 +      - timed: ''
 +
  # ----------------------------------------------
  # ZTE POD9 Triggers running against master branch
  # ----------------------------------------------