summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYibo Cai <yibo.cai@arm.com>2018-04-12 13:06:24 +0800
committerYibo Cai <yibo.cai@arm.com>2018-04-12 13:30:23 +0800
commit528118836535e75702a730a07cca4417d6d12048 (patch)
tree51ca351c82b5d8631e5928d6002de98e536bd624
parentfbdd4518f772e71316548ecd16b94a879873f650 (diff)
container4nfv: add fraser branch in arm jobs
Change-Id: If5b4dfaef431570f65a321209a4fa4c94292d89f Signed-off-by: Yibo Cai <yibo.cai@arm.com>
-rw-r--r--jjb/container4nfv/container4nfv-arm64.yml46
1 files changed, 35 insertions, 11 deletions
diff --git a/jjb/container4nfv/container4nfv-arm64.yml b/jjb/container4nfv/container4nfv-arm64.yml
index 324624387..5f5bc8627 100644
--- a/jjb/container4nfv/container4nfv-arm64.yml
+++ b/jjb/container4nfv/container4nfv-arm64.yml
@@ -4,6 +4,11 @@
name: 'container4nfv-arm64'
project: 'container4nfv'
installer: 'compass'
+ stream:
+ - master:
+ branch: master
+ - fraser:
+ branch: stable/fraser
scenario:
- 'k8-multus-nofeature-noha':
disabled: false
@@ -15,11 +20,11 @@
- baremetal:
slave-label: compass-baremetal-arm
jobs:
- - 'container4nfv-{scenario}-{pod}-daily-master'
+ - 'container4nfv-{scenario}-{pod}-daily-{stream}'
- job-template:
- name: 'container4nfv-{scenario}-{pod}-daily-master'
+ name: 'container4nfv-{scenario}-{pod}-daily-{stream}'
disabled: '{obj:disabled}'
concurrent: false
node: '{slave-label}'
@@ -28,12 +33,12 @@
- git:
url: https://gerrit.opnfv.org/gerrit/compass4nfv
branches:
- - origin/master
+ - '{branch}'
basedir: compass4nfv
wipe-workspace: true
triggers:
- - 'trigger-{scenario}-{pod}'
+ - 'trigger-{scenario}-{pod}-{stream}'
wrappers:
- timeout:
@@ -53,19 +58,38 @@
- trigger:
- name: 'trigger-k8-multus-nofeature-noha-virtual'
+ name: 'trigger-k8-multus-nofeature-noha-virtual-master'
triggers:
- timed: '0 12 * * *'
- trigger:
- name: 'trigger-k8-sriov-nofeature-noha-virtual'
+ name: 'trigger-k8-sriov-nofeature-noha-virtual-master'
triggers:
- - timed: '0 16 * * *'
+ - timed: '0 15 * * *'
- trigger:
- name: 'trigger-k8-multus-nofeature-noha-baremetal'
+ name: 'trigger-k8-multus-nofeature-noha-virtual-fraser'
triggers:
- - timed: '0 16 * * *'
+ - timed: '0 18 * * *'
- trigger:
- name: 'trigger-k8-sriov-nofeature-noha-baremetal'
+ name: 'trigger-k8-sriov-nofeature-noha-virtual-fraser'
triggers:
- - timed: '0 20 * * *'
+ - timed: '0 21 * * *'
+
+
+- trigger:
+ name: 'trigger-k8-multus-nofeature-noha-baremetal-master'
+ triggers:
+ - timed: '0 12 * * *'
+- trigger:
+ name: 'trigger-k8-sriov-nofeature-noha-baremetal-master'
+ triggers:
+ - timed: '0 15 * * *'
+
+- trigger:
+ name: 'trigger-k8-multus-nofeature-noha-baremetal-fraser'
+ triggers:
+ - timed: '0 18 * * *'
+- trigger:
+ name: 'trigger-k8-sriov-nofeature-noha-baremetal-fraser'
+ triggers:
+ - timed: '0 21 * * *'