Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Apex, Functest: Enable smoke tests on Apex master verify
[releng.git] / jjb / yardstick / yardstick-ci-jobs.yml
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 8899baf..57aa29c 100644 (file)
--- 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
 #--------------------------------
@@ -26,81 +28,130 @@
         - opnfv-jump-1:
             installer: apex
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - opnfv-jump-2:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - intel-pod5:
             installer: joid
             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
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - ericsson-pod1:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
-        - virtual:
+        - ericsson-pod2:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - virtual:
+            installer: fuel
+            suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            <<: *brahmaputra
+        - huawei-virtual:
             installer: compass
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - virtual:
             installer: joid
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
 #--------------------------------
 #        master
 #--------------------------------
+        - opnfv-jump-2:
+            installer: fuel
+            suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            <<: *master
         - ericsson-pod1:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - ericsson-pod1:
             installer: fuel
             suite: vtcdaily
+            auto-trigger-name: 'yardstick-vtcdaily-ericsson-pod1-trigger'
             <<: *master
         - ericsson-pod2:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - intel-pod6:
             installer: joid
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - intel-pod8:
             installer: compass
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - zte-build-1:
             installer: fuel
             suite: daily
+            auto-trigger-name: 'yardstick-daily-zte-build-1-trigger'
             <<: *master
         - orange-pod2:
             installer: joid
             suite: daily
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
         - opnfv-jump-1:
             installer: apex
             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
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
-        - virtual:
+        - huawei-virtual:
+            installer: compass
+            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
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *master
 #--------------------------------
 
@@ -115,12 +166,22 @@
 
     disabled: false
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-per-node: 1
+
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 180
+            abort: true
 
     triggers:
-        - 'yardstick-{pod}-trigger'
+        - '{auto-trigger-name}'
 
     parameters:
         - project-parameter:
@@ -131,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
@@ -193,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 \
@@ -254,7 +319,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: ''
+            default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -262,7 +327,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: ''
+            default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -278,7 +343,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: '-i 10.118.36.90:8086'
+            default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -286,7 +351,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: '-i 10.118.36.90:8086'
+            default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -294,7 +359,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: '-r 213.77.62.197/results'
+            default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -302,7 +367,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: '-r 213.77.62.197/results'
+            default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -310,7 +375,15 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: ''
+            default: '-i 104.197.68.199:8086'
+            description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
+    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:
@@ -326,7 +399,7 @@
     parameters:
         - string:
             name: YARDSTICK_DB_BACKEND
-            default: ''
+            default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -337,61 +410,50 @@
             default: ''
             description: 'Arguments to use in order to choose the backend DB'
 
+- parameter:
+    name: 'yardstick-params-huawei-virtual'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            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-zte-build-1-trigger'
+    name: 'yardstick-daily-zte-build-1-trigger'
     triggers:
         - timed: '0 2 * * *'
 
 - trigger:
-    name: 'yardstick-intel-pod5-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-intel-pod6-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-intel-pod8-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-ericsson-pod1-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-ericsson-pod2-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-opnfv-jump-1-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-opnfv-jump-2-trigger'
-    triggers:
-        - timed: ''
-
-- trigger:
-    name: 'yardstick-huawei-us-deploy-bare-1-trigger'
+    name: 'yardstick-vtcdaily-ericsson-pod1-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 1 * * *'
 
 - trigger:
-    name: 'yardstick-orange-pod2-trigger'
+    name: 'yardstick-daily-huawei-sh-test-2-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 1 * * *'
 
 - trigger:
-    name: 'yardstick-virtual-trigger'
+    name: 'yardstick-daily-huawei-sh-pod6-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 1 * * *'
\ No newline at end of file