X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-ci-jobs.yml;h=e241cbeefd31caf30f96da212a4627ad9f4ccff1;hb=ccfee6905c593d028aef03583c7d30e54637ba4f;hp=df51eb135940510c9fe50f2151d0519a792fea7e;hpb=5691606d1ed8caa57e3001767aab7fe19612d272;p=releng.git

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index df51eb135..e241cbeef 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -13,10 +13,12 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
+        docker-tag: 'latest'
     brahmaputra: &brahmaputra
         stream: brahmaputra
         branch: 'stable/{stream}'
         gs-pathname: '{stream}'
+        docker-tag: 'brahmaputra.1.0'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -38,6 +40,11 @@
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
+        - orange-pod2:
+            installer: joid
+            suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            <<: *brahmaputra
         - huawei-us-deploy-bare-1:
             installer: compass
             suite: daily
@@ -101,10 +108,10 @@
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
-        - zte-build-1:
+        - zte-pod1:
             installer: fuel
             suite: daily
-            auto-trigger-name: 'yardstick-daily-zte-build-1-trigger'
+            auto-trigger-name: 'yardstick-daily-zte-pod1-trigger'
             <<: *master
         - orange-pod2:
             installer: joid
@@ -116,6 +123,11 @@
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
+        - huawei-us-deploy-bare-2:
+            installer: compass
+            suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            <<: *master
         - virtual:
             installer: fuel
             suite: daily
@@ -126,6 +138,16 @@
             suite: daily
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
+        - huawei-sh-test-2:
+            installer: compass
+            suite: daily
+            auto-trigger-name: 'yardstick-daily-huawei-sh-test-2-trigger'
+            <<: *master
+        - huawei-sh-pod6:
+            installer: compass
+            suite: daily
+            auto-trigger-name: 'yardstick-daily-huawei-sh-pod6-trigger'
+            <<: *master
         - virtual:
             installer: joid
             suite: daily
@@ -170,6 +192,10 @@
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-odl_l2-nofeature-ha'
+        - string:
+            name: DOCKER_TAG
+            default: '{docker-tag}'
+            description: 'Tag to pull docker image'
         - string:
             name: YARDSTICK_SUITE_NAME
             default: opnfv_${{NODE_NAME}}_{suite}.yaml
@@ -192,7 +218,7 @@
 
     publishers:
         - email:
-            recipients: ana.cunha@ericsson.com jorgen.w.karlsson@ericsson.com
+            recipients: ana.cunha@ericsson.com
 
 ########################
 # builder macros
@@ -232,7 +258,7 @@
                 -e YARDSTICK_BRANCH=${GIT_BRANCH##origin/} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}"
 
             # Pull the latest image
-            docker pull opnfv/yardstick >$redirect
+            docker pull opnfv/yardstick:$DOCKER_TAG >$redirect
 
             # Run docker
             cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \
@@ -353,7 +379,15 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-zte-build-1'
+    name: 'yardstick-params-huawei-us-deploy-bare-2'
+    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-zte-pod1'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
@@ -384,12 +418,28 @@
             default: ''
             description: 'Arguments to use in order to choose the backend DB'
 
+- parameter:
+    name: 'yardstick-params-huawei-sh-test-2'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: ''
+            description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+    name: 'yardstick-params-huawei-sh-pod6'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: ''
+            description: 'Arguments to use in order to choose the backend DB'
+
 #######################
 ## trigger macros
 #######################
 # trigger for PODs to only run yardstick test suites
 - trigger:
-    name: 'yardstick-daily-zte-build-1-trigger'
+    name: 'yardstick-daily-zte-pod1-trigger'
     triggers:
         - timed: '0 2 * * *'
 
@@ -397,3 +447,13 @@
     name: 'yardstick-vtcdaily-ericsson-pod1-trigger'
     triggers:
         - timed: '0 1 * * *'
+
+- trigger:
+    name: 'yardstick-daily-huawei-sh-test-2-trigger'
+    triggers:
+        - timed: '0 1 * * *'
+
+- trigger:
+    name: 'yardstick-daily-huawei-sh-pod6-trigger'
+    triggers:
+        - timed: '0 1 * * *'