Merge "Enable daisy euphrates jobs of daily and functest"

diff --combined jjb/functest/functest-daily-jobs.yml
index 443c639,f47120b..04a2936
--- 1/jjb/functest/functest-daily-jobs.yml
--- 2/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@@ -122,6 -122,14 +122,14 @@@
              slave-label: daisy-virtual
              installer: daisy
              <<: *master
+         - baremetal:
+             slave-label: daisy-baremetal
+             installer: daisy
+             <<: *euphrates
+         - virtual:
+             slave-label: daisy-virtual
+             installer: daisy
+             <<: *euphrates
  # netvirt 3rd party ci
          - virtual:
              slave-label: odl-netvirt-virtual
@@@ -160,15 -168,19 +168,19 @@@
              <<: *euphrates
          - zte-pod2:
              slave-label: '{pod}'
-             installer: fuel
+             installer: daisy
              <<: *master
+         - zte-pod2:
+             slave-label: '{pod}'
+             installer: daisy
+             <<: *euphrates
          - zte-pod3:
              slave-label: '{pod}'
-             installer: fuel
+             installer: daisy
              <<: *master
          - zte-pod3:
              slave-label: '{pod}'
-             installer: fuel
+             installer: daisy
              <<: *euphrates
  # PODs for verify jobs triggered by each patch upload
  #        - ool-virtual1:
@@@ -216,7 -228,7 +228,7 @@@
  
      wrappers:
          - build-name:
 -            name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
 +            name: '$BUILD_NUMBER Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO'
          - timeout:
              timeout: '{job-timeout}'
              abort: true
@@@ -297,26 -309,19 +309,26 @@@
      name: functest-daily-parameter
      parameters:
          - string:
 -            name: FUNCTEST_SUITE_NAME
 +            name: FUNCTEST_MODE
              default: 'daily'
              description: "Daily suite name to run"
  - parameter:
      name: functest-arm-daily-parameter
      parameters:
          - string:
 -            name: FUNCTEST_SUITE_NAME
 +            name: FUNCTEST_MODE
              default: 'arm-daily'
              description: "Daily suite name (Aarch64) to run"
  - parameter:
      name: functest-suite-parameter
      parameters:
 +        - choice:
 +            name: FUNCTEST_MODE
 +            choices:
 +                - 'tier'
 +                - 'testcase'
 +            default: 'tier'
 +            description: "Test case or Tier to be run"
          - choice:
              name: FUNCTEST_SUITE_NAME
              choices:
@@@ -329,6 -334,7 +341,6 @@@
                  - 'rally_sanity'
                  - 'odl'
                  - 'odl_netvirt'
 -                - 'onos'
                  - 'snaps_smoke'
                  - 'refstack_defcore'
                  - 'promise'
@@@ -342,16 -348,6 +354,16 @@@
                  - 'cloudify_vrouter'
                  - 'orchestra_openims'
                  - 'orchestra_clearwaterims'
 +            default: 'connection_check'
 +        - choice:
 +            name: FUNCTEST_TIER
 +            choices:
 +                - 'healthcheck'
 +                - 'smoke'
 +                - 'features'
 +                - 'components'
 +                - 'vnf'
 +            default: 'healthcheck'
          - string:
              name: TESTCASE_OPTIONS
              default: ''
@@@ -411,7 -407,7 +423,7 @@@
      name: functest-suite-builder
      builders:
          - 'functest-cleanup'
 -        - 'set-functest-env'
 +        - 'set-functest-env-alpine'
          - 'functest-suite'
          - 'functest-store-results'
          - 'functest-exit'
@@@ -423,7 -419,6 +435,7 @@@
          - 'set-functest-env-alpine'
          - 'functest-daily'
          - 'functest-store-results'
 +        - 'functest-exit'
  
  - builder:
      name: functest-daily
@@@ -444,8 -439,7 +456,8 @@@
      name: functest-suite
      builders:
          - shell:
 -            !include-raw: ./functest-suite.sh
 +            !include-raw:
 +                - ./functest-alpine.sh
  
  - builder:
      name: set-functest-env