X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick-ci-jobs.yml;h=dd88a52b6e704b62adf208e4f072f4134a70f581;hb=9d8271d16150ccedc70e231e4ff0ab3bb9934abe;hp=c8d50a0ea66f98edf6430093b927159a1128dac8;hpb=0b6595dfff8c4cd29a874fc6e697b63e0b57c92e;p=releng.git

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index c8d50a0ea..dd88a52b6 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -1,5 +1,5 @@
 ###################################
-# job configuration for functest
+# job configuration for yardstick
 ###################################
 - project:
     name: yardstick
@@ -14,11 +14,11 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: 'latest'
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
+    colorado: &colorado
+        stream: colorado
         branch: 'stable/{stream}'
         gs-pathname: '{stream}'
-        docker-tag: 'brahmaputra.1.0'
+        docker-tag: 'stable'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -43,12 +43,33 @@
             slave-label: fuel-baremetal
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *colorado
         - virtual:
             slave-label: fuel-virtual
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *colorado
+# armband CI PODs
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
 # joid CI PODs
         - baremetal:
             slave-label: joid-baremetal
@@ -64,12 +85,12 @@
             slave-label: joid-baremetal
             installer: joid
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *colorado
         - virtual:
             slave-label: joid-virtual
             installer: joid
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *colorado
 
 # compass CI PODs
         - baremetal:
@@ -86,12 +107,12 @@
             slave-label: compass-baremetal
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *colorado
         - virtual:
             slave-label: compass-virtual
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *colorado
 #--------------------------------
 #    Installers not using labels
 #            CI PODs
@@ -107,20 +128,25 @@
             slave-label: '{pod}'
             installer: apex
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
+            <<: *colorado
 #--------------------------------
 #        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
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
+        - zte-pod1:
+            slave-label: '{pod}'
+            installer: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
         - zte-pod2:
             slave-label: '{pod}'
             installer: fuel
@@ -131,7 +157,12 @@
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
-        - arm-pod1:
+        - zte-pod3:
+            slave-label: '{pod}'
+            installer: fuel
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *colorado
+        - arm-pod2:
             slave-label: '{pod}'
             installer: fuel
             auto-trigger-name: 'daily-trigger-disabled'
@@ -192,8 +223,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{slave-label}-defaults'
         - '{installer}-defaults'
+        - '{slave-label}-defaults'
         - 'yardstick-params-{slave-label}'
         - string:
             name: DEPLOY_SCENARIO
@@ -271,6 +302,20 @@
             name: YARDSTICK_DB_BACKEND
             default: ''
             description: 'Arguments to use in order to choose the backend DB'
+- parameter:
+    name: 'yardstick-params-armband-baremetal'
+    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-armband-virtual'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: ''
+            description: 'Arguments to use in order to choose the backend DB'
 - parameter:
     name: 'yardstick-params-joid-baremetal'
     parameters:
@@ -348,6 +393,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:
@@ -357,7 +410,7 @@
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-arm-pod1'
+    name: 'yardstick-params-arm-pod2'
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND