diff options
| author |   mei mei <meimei@huawei.com> | 2018-04-17 01:34:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-17 01:34:53 +0000 |
| commit | 7c0d98f1f5811ac15cdc043621530fa89f297615 (patch) | |
| tree | 0d12aa63ee30b2f0e5f4c981e8e5273c6f6a4d01 | |
| parent | 5081dfa0afcf464c1a26cf2f68ebde76373165cb (diff) | |
| parent | 528118836535e75702a730a07cca4417d6d12048 (diff) | |
Merge "container4nfv: add fraser branch in arm jobs"
| -rw-r--r-- | jjb/container4nfv/container4nfv-arm64.yml | 46 |
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 * * *' |