summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2018-09-13 01:12:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-13 01:12:56 +0000
commita75cb5270680135361eaf6354b693477a2dcb395 (patch)
treeec1968b3028f2fc8d150115d2374ceaf7c8366bc
parent0ee36b71b34afa6f54415a8ed7bcd25222591a4e (diff)
parent8edffce00f9ec875fdc5d75effbe645ca5f2872f (diff)
Merge "Add functest-k8 job for arm platform"
-rw-r--r--jjb/container4nfv/container4nfv-arm64.yaml8
-rw-r--r--jjb/functest/functest-daily-jobs.yaml8
-rw-r--r--jjb/global/slave-params.yaml11
3 files changed, 27 insertions, 0 deletions
diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml
index b66667471..069a5d25e 100644
--- a/jjb/container4nfv/container4nfv-arm64.yaml
+++ b/jjb/container4nfv/container4nfv-arm64.yaml
@@ -61,6 +61,14 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'Failure'
+ - project: functest-compass-arm-virtual-daily-master
+ current-parameters: false
+ same-node: true
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'Failure'
- project: container4nfv-k8-multus-nofeature-noha-{pod}-daily-{stream}
current-parameters: true
same-node: true
diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 9262988e1..daed74ea3 100644
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -78,6 +78,10 @@
slave-label: compass-virtual
installer: compass
<<: *master
+ - arm-virtual:
+ slave-label: compass-arm-virtual
+ installer: compass
+ <<: *master
- baremetal:
slave-label: compass-baremetal
installer: compass
@@ -86,6 +90,10 @@
slave-label: compass-virtual
installer: compass
<<: *fraser
+ - arm-virtual:
+ slave-label: compass-arm-virtual
+ installer: compass
+ <<: *fraser
# apex CI PODs
- virtual:
slave-label: apex-virtual-master
diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 65c9a2871..5b9ce413c 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -355,6 +355,17 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
+ name: 'compass-arm-virtual-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'compass-arm-virtual'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+
+- parameter:
name: 'compass-virtual-master-defaults'
parameters:
- label: