summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/armband/armband-ci-jobs.yml2
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml93
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml4
-rw-r--r--jjb/functest/functest-ci-jobs.yml38
-rw-r--r--jjb/opnfv/slave-params.yml47
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml4
-rw-r--r--jjb/releng-macros.yaml5
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml84
8 files changed, 118 insertions, 159 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 031c972b3..7d392414f 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -39,7 +39,7 @@
# NOHA scenarios
- 'os-odl_l2-nofeature-noha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
jobs:
- 'armband-{scenario}-{pod}-daily-{stream}'
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 40f5445dd..7ce926890 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -14,33 +14,35 @@
stream: brahmaputra
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
-
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
- pod:
-#--------------------------------
-# brahmaputra
+# CI PODs
#--------------------------------
- - huawei-pod1:
+ pod:
+ - baremetal:
+ slave-label: compass-baremetal
+ os-version: 'trusty'
+ <<: *master
+ - virtual:
+ slave-label: compass-virtual
+ os-version: 'trusty'
+ <<: *master
+ - baremetal:
+ slave-label: compass-baremetal
os-version: 'trusty'
<<: *brahmaputra
- - huawei-virtual:
+ - virtual:
+ slave-label: compass-virtual
os-version: 'trusty'
<<: *brahmaputra
#--------------------------------
# master
#--------------------------------
- huawei-pod2:
+ slave-label: '{pod}'
os-version: 'centos7'
<<: *master
-# - intel-pod8:
- - huawei-pod1:
- os-version: 'trusty'
- <<: *master
- - huawei-virtual:
- os-version: 'trusty'
- <<: *master
scenario:
- 'os-nosdn-nofeature-ha':
@@ -95,7 +97,7 @@
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
- - '{pod}-defaults'
+ - '{slave-label}-defaults'
- '{installer}-defaults'
triggers:
@@ -164,7 +166,7 @@
- compass-ci-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- - '{pod}-defaults'
+ - '{slave-label}-defaults'
- '{installer}-defaults'
scm:
@@ -235,105 +237,84 @@
- timed: ''
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-master-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '0 3 * * *'
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-master-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-master-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-pod1-master-trigger'
+ name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-pod1-master-trigger'
+ name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '0 9 * * *'
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-pod1-brahmaputra-trigger'
- triggers:
- - timed: ''
-
-- trigger:
- name: 'compass-os-nosdn-nofeature-ha-intel-pod8-master-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-master-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-intel-pod8-master-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-baremetal-brahmaputra-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-intel-pod8-master-trigger'
+ name: 'compass-os-onos-nofeature-ha-baremetal-brahmaputra-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-ocl-nofeature-ha-intel-pod8-master-trigger'
+ name: 'compass-os-ocl-nofeature-ha-baremetal-brahmaputra-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-master-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
triggers:
- timed: '0 3 * * *'
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-master-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-master-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-virtual-master-trigger'
+ name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-virtual-master-trigger'
+ name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger'
triggers:
- timed: '0 9 * * *'
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+ name: 'compass-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+ name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger'
triggers:
- timed: ''
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 920923a34..9db709dfe 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -6,7 +6,7 @@
project: 'compass4nfv'
- pod: 'huawei-virtual'
+ pod: 'compass-virtual'
stream:
- master:
@@ -119,7 +119,7 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'compass-deploy-huawei-virtual-daily-.*?'
+ - 'compass-deploy-virtual-daily-.*?'
block-level: 'NODE'
scm:
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 24673612b..d7e37292a 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -69,6 +69,23 @@
slave-label: joid-virtual
installer: joid
<<: *brahmaputra
+# compass CI PODs
+ - baremetal:
+ slave-label: compass-baremetal
+ installer: compass
+ <<: *master
+ - virtual:
+ slave-label: compass-virtual
+ installer: compass
+ <<: *master
+ - baremetal:
+ slave-label: compass-baremetal
+ installer: compass
+ <<: *brahmaputra
+ - virtual:
+ slave-label: compass-virtual
+ installer: compass
+ <<: *brahmaputra
#--------------------------------
# Installers not using labels
# CI PODs
@@ -83,14 +100,6 @@
slave-label: '{pod}'
installer: apex
<<: *brahmaputra
- - intel-pod8:
- slave-label: '{pod}'
- installer: compass
- <<: *master
- - huawei-pod1:
- slave-label: '{pod}'
- installer: compass
- <<: *brahmaputra
#--------------------------------
# None-CI PODs
#--------------------------------
@@ -106,18 +115,10 @@
slave-label: '{pod}'
installer: joid
<<: *master
- - huawei-virtual:
- slave-label: '{pod}'
- installer: compass
- <<: *master
- huawei-pod2:
slave-label: '{pod}'
installer: compass
<<: *master
- - huawei-pod1:
- slave-label: '{pod}'
- installer: compass
- <<: *master
- nokia-pod1:
slave-label: '{pod}'
installer: apex
@@ -134,10 +135,6 @@
slave-label: '{pod}'
installer: fuel
<<: *brahmaputra
- - huawei-virtual:
- slave-label: '{pod}'
- installer: compass
- <<: *brahmaputra
#--------------------------------
testsuite:
@@ -263,7 +260,6 @@
- 'set-functest-env'
- 'functest-suite'
-
- builder:
name: functest-suite
builders:
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index d89af419a..02d74abff 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -47,6 +47,26 @@
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- parameter:
+ name: 'compass-baremetal-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'compass-baremetal'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+- parameter:
+ name: 'compass-virtual-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'compass-virtual'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+- parameter:
name: 'lf-pod1-defaults'
parameters:
- node:
@@ -68,7 +88,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
-
- parameter:
name: 'lf-pod2-defaults'
parameters:
@@ -304,21 +323,6 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'huawei-virtual-defaults'
- parameters:
- - label:
- name: SLAVE_LABEL
- default: 'huawei-deploy-vm'
- - string:
- name: INSTALLER_VERSION
- default: stable
- description: 'Version of the installer to deploy'
- - 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:
@@ -508,17 +512,6 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'virtual-defaults'
- parameters:
- - label:
- name: SLAVE_LABEL
- default: '{installer}-deploy-virtual'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on these Jenkins Slaves'
-
-- parameter:
name: 'ericsson-build-defaults'
parameters:
- label:
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 39d856ea7..ee321eb5b 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -29,7 +29,7 @@
<<: *brahmaputra
- orange-pod2:
installer: joid
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *brahmaputra
#--------------------------------
# master
@@ -37,7 +37,7 @@
- juniper-pod1:
installer: joid
<<: *master
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
# - zte-pod1: #would be confirmed with the ZTE lab by tomorrow
# installer: fuel
# <<: *master
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index cdbb0bac3..d8866bdb0 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -62,11 +62,6 @@
- timed: ''
- trigger:
- name: 'brahmaputra-trigger-daily-disabled'
- triggers:
- - timed: ''
-
-- trigger:
name: 'brahmaputra-trigger-daily-enabled'
triggers:
- timed: '0 2 * * *'
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 3d59e61ce..48c335a03 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -32,51 +32,73 @@
- baremetal:
slave-label: fuel-baremetal
installer: fuel
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- virtual:
slave-label: fuel-virtual
installer: fuel
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- baremetal:
slave-label: fuel-baremetal
installer: fuel
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *brahmaputra
- virtual:
slave-label: fuel-virtual
installer: fuel
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *brahmaputra
# just in case if things go wrong
- lf-pod2:
slave-label: '{pod}'
installer: fuel
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
installer: joid
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- virtual:
slave-label: joid-virtual
installer: joid
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- baremetal:
slave-label: joid-baremetal
installer: joid
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *brahmaputra
- virtual:
slave-label: joid-virtual
installer: joid
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *brahmaputra
+
+# 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
+ - virtual:
+ slave-label: compass-virtual
+ installer: compass
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *brahmaputra
#--------------------------------
# Installers not using labels
@@ -87,22 +109,12 @@
- lf-pod1:
slave-label: '{pod}'
installer: apex
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- lf-pod1:
slave-label: '{pod}'
installer: apex
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *brahmaputra
- - intel-pod8:
- slave-label: '{pod}'
- installer: compass
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *master
- - huawei-pod1:
- slave-label: '{pod}'
- installer: compass
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *brahmaputra
#--------------------------------
# None-CI PODs
@@ -110,35 +122,22 @@
- orange-pod2:
slave-label: '{pod}'
installer: joid
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *brahmaputra
- zte-pod1:
slave-label: '{pod}'
installer: fuel
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- orange-pod2:
slave-label: '{pod}'
installer: joid
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *master
- - huawei-pod1:
- slave-label: '{pod}'
- installer: compass
- suite: daily
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- huawei-pod2:
slave-label: '{pod}'
installer: compass
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *master
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *master
- - huawei-virtual:
- slave-label: '{pod}'
- installer: compass
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- huawei-pod3:
slave-label: '{pod}'
@@ -150,11 +149,6 @@
installer: compass
auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
<<: *master
- - huawei-virtual:
- slave-label: '{pod}'
- installer: compass
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- <<: *brahmaputra
#--------------------------------
testsuite:
- 'daily'
@@ -305,7 +299,7 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-huawei-pod1'
+ name: 'yardstick-params-compass-baremetal'
parameters:
- string:
name: YARDSTICK_DB_BACKEND
@@ -345,7 +339,7 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
- name: 'yardstick-params-huawei-virtual'
+ name: 'yardstick-params-compass-virtual'
parameters:
- string:
name: YARDSTICK_DB_BACKEND