summaryrefslogtreecommitdiffstats
path: root/jjb/yardstick/yardstick-ci-jobs.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/yardstick/yardstick-ci-jobs.yml')
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml140
1 files changed, 79 insertions, 61 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 21b6691b7..9566651ff 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
#--------------------------------
@@ -26,81 +28,120 @@
- 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
+ - 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
- 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
- virtual:
installer: joid
suite: daily
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
#--------------------------------
@@ -115,12 +156,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:
@@ -132,6 +183,10 @@
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
description: 'Path to test suite'
@@ -193,7 +248,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 +309,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 +317,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 +333,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 +341,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 +349,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 +357,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 +365,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:
@@ -326,7 +381,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:
@@ -345,66 +400,29 @@
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'
+
#######################
## 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'
- triggers:
- - timed: ''
-
-- trigger:
- name: 'yardstick-orange-pod2-trigger'
- triggers:
- - timed: ''
-
-- trigger:
- name: 'yardstick-virtual-trigger'
+ name: 'yardstick-vtcdaily-ericsson-pod1-trigger'
triggers:
- - timed: ''
+ - timed: '0 1 * * *'
- trigger:
- name: 'yardstick-huawei-virtual-trigger'
+ name: 'yardstick-daily-huawei-sh-test-2-trigger'
triggers:
- - timed: ''
+ - timed: '0 1 * * *'