summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml53
-rw-r--r--jjb/dovetail/dovetail-project-jobs.yml98
-rw-r--r--jjb/functest/functest-ci-jobs.yml4
-rw-r--r--jjb/opnfv/slave-params.yml13
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml15
5 files changed, 174 insertions, 9 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 946ecac79..16c6695c2 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -41,6 +41,10 @@
#--------------------------------
- huawei-pod2:
slave-label: '{pod}'
+ os-version: 'trusty'
+ <<: *colorado
+ - huawei-pod5:
+ slave-label: '{pod}'
os-version: 'centos7'
<<: *master
@@ -245,35 +249,68 @@
# trigger macros
########################
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-master-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-huawei-pod5-master-trigger'
triggers:
- timed: '0 19 * * *'
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-pod5-master-trigger'
triggers:
- timed: '0 23 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-huawei-pod5-master-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger'
+ name: 'compass-os-onos-nofeature-ha-huawei-pod5-master-trigger'
+ triggers:
+ - timed: '0 7 * * *'
+- trigger:
+ name: 'compass-os-ocl-nofeature-ha-huawei-pod5-master-trigger'
+ triggers:
+ - timed: '0 11 * * *'
+- trigger:
+ name: 'compass-os-onos-sfc-ha-huawei-pod5-master-trigger'
+ triggers:
+ - timed: '0 3 * * *'
+- trigger:
+ name: 'compass-os-odl_l2-moon-ha-huawei-pod5-master-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
+ name: 'compass-os-nosdn-kvm-ha-huawei-pod5-master-trigger'
+ triggers:
+ - 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-onos-sfc-ha-huawei-pod2-master-trigger'
+ name: 'compass-os-ocl-nofeature-ha-huawei-pod2-colorado-trigger'
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-moon-ha-huawei-pod2-master-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-master-trigger'
+ name: 'compass-os-nosdn-kvm-ha-huawei-pod2-colorado-trigger'
triggers:
- timed: ''
diff --git a/jjb/dovetail/dovetail-project-jobs.yml b/jjb/dovetail/dovetail-project-jobs.yml
new file mode 100644
index 000000000..bf0552251
--- /dev/null
+++ b/jjb/dovetail/dovetail-project-jobs.yml
@@ -0,0 +1,98 @@
+###################################################
+# Non-ci jobs for Dovetail project
+# They will only be enabled on request by projects!
+###################################################
+- project:
+ name: dovetail-project-jobs
+
+ project: 'dovetail'
+
+ jobs:
+ - 'dovetail-verify-{stream}'
+ - 'dovetail-merge-{stream}'
+
+ stream:
+ - master:
+ branch: '{stream}'
+ disabled: false
+
+################################
+# job templates
+################################
+
+- job-template:
+ name: 'dovetail-verify-{stream}'
+
+ disabled: '{obj:disabled}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - 'opnfv-build-ubuntu-defaults'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ triggers:
+ - gerrit:
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ builders:
+ - shell: |
+ echo "dovetail: verify job"
+ #unittest will be added future
+
+- job-template:
+ name: 'dovetail-merge-{stream}'
+
+ disabled: '{obj:disabled}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - 'opnfv-build-ubuntu-defaults'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ choosing-strategy: 'default'
+
+ triggers:
+ - gerrit:
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: 'remerge'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+
+ builders:
+ - shell: |
+ echo "dovetail: merge"
+ #unittest will be added future
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 7120790d8..d5b99b2a3 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -131,6 +131,10 @@
- huawei-pod2:
slave-label: '{pod}'
installer: compass
+ <<: *colorado
+ - huawei-pod5:
+ slave-label: '{pod}'
+ installer: compass
<<: *master
- nokia-pod1:
slave-label: '{pod}'
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index b2f17c1e7..ff24e9e6d 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -436,6 +436,19 @@
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
- parameter:
+ name: 'huawei-pod5-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - huawei-pod5
+ default-slaves:
+ - huawei-pod5
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+- parameter:
name: 'zte-pod1-defaults'
parameters:
- node:
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index d0794ebac..1cb1c9779 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -181,7 +181,7 @@
slave-label: '{pod}'
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *master
+ <<: *colorado
- huawei-pod3:
slave-label: '{pod}'
installer: compass
@@ -192,6 +192,11 @@
installer: compass
auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
<<: *master
+ - huawei-pod5:
+ slave-label: '{pod}'
+ installer: compass
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
#--------------------------------
testsuite:
- 'daily'
@@ -375,6 +380,14 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
+ name: 'yardstick-params-huawei-pod5'
+ 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-zte-pod1'
parameters:
- string: