summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-10-10 07:30:08 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-10 07:30:08 +0000
commit56d2e9a30ceb114678428152e4b54fb52c398ebe (patch)
treedeab3d1494603a3b6491a301aafe5ab4c026406e
parent162e331a842eaca01f38ac344816440b2aa0b8f5 (diff)
parent5703c5630be7d46937595ecf8d81d1569f57eb3d (diff)
Merge "[compass] put huawei-pod2 into CI resource pool"
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml14
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml38
-rw-r--r--jjb/functest/functest-ci-jobs.yml4
-rw-r--r--jjb/opnfv/slave-params.yml14
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml13
5 files changed, 1 insertions, 82 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 4bc56ab1b..7f2e6bf8a 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -68,12 +68,6 @@
# installer: joid
# auto-trigger-name: 'daily-trigger-disabled'
# <<: *master
- - huawei-pod2:
- slave-label: '{pod}'
- installer: compass
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *master
-
#--------------------------------------------
suite:
- 'rubbos'
@@ -225,14 +219,6 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'bottlenecks-params-huawei-pod2'
- parameters:
- - string:
- name: BOTTLENECKS_DB_TARGET
- default: '104.197.68.199:8086'
- description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
name: 'bottlenecks-params-orange-pod2'
parameters:
- string:
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 16c6695c2..ce500efed 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -39,10 +39,6 @@
#--------------------------------
# master
#--------------------------------
- - huawei-pod2:
- slave-label: '{pod}'
- os-version: 'trusty'
- <<: *colorado
- huawei-pod5:
slave-label: '{pod}'
os-version: 'centos7'
@@ -103,6 +99,7 @@
use-build-blocker: true
blocking-jobs:
- 'compass-os-.*?-{pod}-daily-.*?'
+ - 'compass-os-.*?-baremetal-daily-.*?'
- 'compass-verify-[^-]*'
block-level: 'NODE'
@@ -282,39 +279,6 @@
- timed: ''
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-colorado-trigger'
- triggers:
- - timed: '0 19 * * *'
-- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-colorado-trigger'
- triggers:
- - timed: '0 23 * * *'
-- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-colorado-trigger'
- triggers:
- - timed: '0 15 * * *'
-- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-pod2-colorado-trigger'
- triggers:
- - timed: '0 11 * * *'
-- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-pod2-colorado-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'compass-os-onos-sfc-ha-huawei-pod2-colorado-trigger'
- triggers:
- - timed: '0 7 * * *'
-- trigger:
- name: 'compass-os-odl_l2-moon-ha-huawei-pod2-colorado-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'compass-os-nosdn-kvm-ha-huawei-pod2-colorado-trigger'
- triggers:
- - timed: ''
-
-- trigger:
name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '0 2 * * *'
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 4747835b1..348779308 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -128,10 +128,6 @@
slave-label: '{pod}'
installer: joid
<<: *master
- - huawei-pod2:
- slave-label: '{pod}'
- installer: compass
- <<: *colorado
- huawei-pod5:
slave-label: '{pod}'
installer: compass
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 6cbaba4a5..4ffaff4ae 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -378,20 +378,6 @@
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'huawei-pod2-defaults'
- parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - huawei-pod2
- default-slaves:
- - huawei-pod2
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-- parameter:
name: 'huawei-pod3-defaults'
parameters:
- node:
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 1cb1c9779..962ea4743 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -177,11 +177,6 @@
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- - huawei-pod2:
- slave-label: '{pod}'
- installer: compass
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *colorado
- huawei-pod3:
slave-label: '{pod}'
installer: compass
@@ -372,14 +367,6 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-huawei-pod2'
- 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-huawei-pod5'
parameters:
- string: