summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-02-01 17:07:30 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-01 17:07:30 +0000
commitf73e90d0d2d0de8e5c9f130db19525902f5e1c11 (patch)
tree4a33d4126df41894e11963fb3c596ace0f4579aa /jjb
parentbdcbaf0afc5d704eb9d3099f83eb7ebcfa6582ff (diff)
parent26e4b705e59b26f59ad13e798679e85d9e759f84 (diff)
Merge "yardstick: Enable trigger for vtc on ericsson-pod1"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml77
1 files changed, 23 insertions, 54 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index c5c269d16..fe625af85 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -26,34 +26,42 @@
- 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
- 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:
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
@@ -61,46 +69,57 @@
- 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
- huawei-virtual:
installer: compass
suite: daily
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
- virtual:
installer: joid
suite: daily
+ auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *master
#--------------------------------
@@ -127,7 +146,7 @@
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
triggers:
- - 'yardstick-{pod}-trigger'
+ - '{auto-trigger-name}'
parameters:
- project-parameter:
@@ -357,61 +376,11 @@
#######################
# 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'
+ name: 'yardstick-vtcdaily-ericsson-pod1-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'
- triggers:
- - timed: ''
-
-- trigger:
- name: 'yardstick-huawei-virtual-trigger'
- triggers:
- - timed: ''
+ - timed: '0 1 * * *'