summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2016-05-31 10:48:06 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-31 10:48:06 +0000
commit8fe6245d6dc0c430192efd0ab70156b5521caa8a (patch)
treebbce99ac6793fffbd3f23ede58ed95c40588e4ab
parent1e2c8d51ccc9720758f01e418957fdd826c278df (diff)
parenta80964a8441ecdd19104a0d02adac553a82a5cd5 (diff)
Merge "bottlenecks: redefine the jobs accordingly"
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml138
1 files changed, 52 insertions, 86 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index c3edce151..686b7d45c 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -27,52 +27,54 @@
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
-# brahmaputra
+# Installers using labels
+# CI PODs
+# This section should only contain the installers
+# that have been switched using labels for slaves
#--------------------------------
pod:
- - lf-pod2:
- installer: fuel
- disabled: true
- <<: *brahmaputra
- - intel-pod5:
- installer: joid
- disabled: true
+#compass CI PODs
+ - baremetal:
+ slave-label: compass-baremetal
+ installer: compass
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
+ - virtual:
+ slave-label: compass-virtual
+ installer: compass
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
+ - baremetal:
+ slave-label: compass-baremetal
+ installer: compass
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *brahmaputra
- - huawei-pod1:
+ - virtual:
+ slave-label: compass-virtual
installer: compass
- disabled: true
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *brahmaputra
+
#--------------------------------
-# master
+# None-CI PODs
#--------------------------------
- - lf-pod2:
- installer: fuel
- <<: *master
- - ericsson-pod1:
- installer: fuel
- disabled: true
- <<: *master
- - ericsson-pod2:
- installer: fuel
- disabled: true
- <<: *master
- - intel-pod6:
+ - orange-pod2:
+ slave-label: '{pod}'
installer: joid
- disabled: true
- <<: *master
- - intel-pod8:
- installer: compass
- disabled: true
- <<: *master
- - zte-pod1:
- installer: fuel
- disabled: true
- <<: *master
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *brahmaputra
- orange-pod2:
+ slave-label: '{pod}'
installer: joid
- disabled: false
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
-#--------------------------------
+ - huawei-pod2:
+ slave-label: '{pod}'
+ installer: compass
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
+
+#--------------------------------------------
suite:
- 'rubbos'
- 'vstf'
@@ -86,18 +88,22 @@
- job-template:
name: 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
- disabled: '{disabled}'
-
wrappers:
- build-name:
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+ - timeout:
+ timeout: 180
+ abort: true
+
+ triggers:
+ - '{auto-trigger-name}'
parameters:
- project-parameter:
project: '{project}'
- - '{pod}-defaults'
+ - '{slave-label}-defaults'
- '{installer}-defaults'
- - 'bottlenecks-params-{pod}'
+ - 'bottlenecks-params-{slave-label}'
- string:
name: REPO_DIR
default: "/home/opnfv/bottlenecks"
@@ -203,67 +209,27 @@
####################
- parameter:
- name: 'bottlenecks-params-intel-pod5'
- parameters:
- - string:
- name: BOTTLENECKS_DB_TARGET
- default: '213.77.62.197'
- description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
- name: 'bottlenecks-params-intel-pod6'
- parameters:
- - string:
- name: BOTTLENECKS_DB_TARGET
- default: '213.77.62.197'
- description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
- name: 'bottlenecks-params-intel-pod8'
- parameters:
- - string:
- name: BOTTLENECKS_DB_TARGET
- default: '213.77.62.197'
- description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
- name: 'bottlenecks-params-ericsson-pod1'
- parameters:
- - string:
- name: BOTTLENECKS_DB_TARGET
- default: '213.77.62.197'
- description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
- name: 'bottlenecks-params-ericsson-pod2'
- parameters:
- - string:
- name: BOTTLENECKS_DB_TARGET
- default: '213.77.62.197'
- description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
- name: 'bottlenecks-params-lf-pod2'
+ name: 'bottlenecks-params-compass-baremetal'
parameters:
- string:
name: BOTTLENECKS_DB_TARGET
- default: '213.77.62.197'
+ default: '104.197.68.199:8086'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'bottlenecks-params-huawei-pod1'
+ name: 'bottlenecks-params-compass-virtual'
parameters:
- string:
name: BOTTLENECKS_DB_TARGET
- default: '213.77.62.197'
+ default: ''
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'bottlenecks-params-zte-pod1'
+ name: 'bottlenecks-params-huawei-pod2'
parameters:
- string:
name: BOTTLENECKS_DB_TARGET
- default: '213.77.62.197'
+ default: '104.197.68.199:8086'
description: 'Arguments to use in order to choose the backend DB'
- parameter:
@@ -271,5 +237,5 @@
parameters:
- string:
name: BOTTLENECKS_DB_TARGET
- default: '213.77.62.197'
+ default: '104.197.68.199:8086'
description: 'Arguments to use in order to choose the backend DB'