Merge "[ZTE PODS]override fuel ip in functest and yardstick ci job"

diff --combined jjb/functest/functest-ci-jobs.yml
index e6b977f,0438061..7afd7d1
--- 1/jjb/functest/functest-ci-jobs.yml
--- 2/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@@ -91,10 -91,10 +91,10 @@@
  #--------------------------------
  #        None-CI PODs
  #--------------------------------
 -        - orange-pod2:
 +        - orange-pod1:
              slave-label: '{pod}'
              installer: joid
 -            <<: *brahmaputra
 +            <<: *master
          - orange-pod5:
              slave-label: '{pod}'
              installer: fuel
@@@ -168,8 -168,8 +168,8 @@@
      parameters:
          - project-parameter:
              project: '{project}'
-         - '{slave-label}-defaults'
          - '{installer}-defaults'
+         - '{slave-label}-defaults'
          - 'functest-{testsuite}-parameter'
          - string:
              name: DEPLOY_SCENARIO

diff --combined jjb/yardstick/yardstick-ci-jobs.yml
index 0d2937c,6175305..a77b5c6
--- 1/jjb/yardstick/yardstick-ci-jobs.yml
--- 2/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@@ -111,11 -111,11 +111,11 @@@
  #--------------------------------
  #        None-CI PODs
  #--------------------------------
 -        - orange-pod2:
 +        - orange-pod1:
              slave-label: '{pod}'
              installer: joid
              auto-trigger-name: 'daily-trigger-disabled'
 -            <<: *brahmaputra
 +            <<: *master
          - zte-pod1:
              slave-label: '{pod}'
              installer: fuel
@@@ -192,8 -192,8 +192,8 @@@
      parameters:
          - project-parameter:
              project: '{project}'
-         - '{slave-label}-defaults'
          - '{installer}-defaults'
+         - '{slave-label}-defaults'
          - 'yardstick-params-{slave-label}'
          - string:
              name: DEPLOY_SCENARIO
@@@ -348,14 -348,6 +348,14 @@@
              default: '-i 104.197.68.199:8086'
              description: 'Arguments to use in order to choose the backend DB'
  
 +- parameter:
 +    name: 'yardstick-params-orange-pod1'
 +    parameters:
 +        - string:
 +            name: YARDSTICK_DB_BACKEND
 +            default: '-i 104.197.68.199:8086'
 +            description: 'Arguments to use in order to choose the backend DB'
 +
  - parameter:
      name: 'yardstick-params-orange-pod2'
      parameters: