diff options
| -rw-r--r-- | jjb/armband/armband.yml | 9 | ||||
| -rw-r--r-- | jjb/availability/availability.yml | 9 | ||||
| -rw-r--r-- | jjb/conductor/conductor.yml | 9 | ||||
| -rw-r--r-- | jjb/copper/copper.yml | 9 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yml | 9 | ||||
| -rw-r--r-- | jjb/dpacc/dpacc.yml | 9 | ||||
| -rw-r--r-- | jjb/fastpathmetrics/fastpathmetrics.yml | 9 | ||||
| -rw-r--r-- | jjb/ipv6/ipv6.yml | 9 | ||||
| -rw-r--r-- | jjb/joid/joid-project-jobs.yml | 7 | ||||
| -rw-r--r-- | jjb/kvmfornfv/kvmfornfv.yml | 29 | ||||
| -rw-r--r-- | jjb/octopus/octopus.yml | 9 | ||||
| -rw-r--r-- | jjb/ovsnfv/ovsnfv.yml | 7 | ||||
| -rw-r--r-- | jjb/parser/parser.yml | 9 | ||||
| -rw-r--r-- | jjb/pharos/pharos.yml | 9 | ||||
| -rw-r--r-- | jjb/prediction/prediction.yml | 9 | ||||
| -rw-r--r-- | jjb/promise/promise.yml | 9 | ||||
| -rw-r--r-- | jjb/storperf/storperf.yml | 23 | ||||
| -rw-r--r-- | jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml | 113 | ||||
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 9 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 9 |
20 files changed, 107 insertions, 207 deletions
diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml index c35f28784..8de95c2e1 100644 --- a/jjb/armband/armband.yml +++ b/jjb/armband/armband.yml @@ -10,14 +10,13 @@ jobs: - 'armband-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'armband-verify-{stream}' diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml index 2f0812b84..a320ff732 100644 --- a/jjb/availability/availability.yml +++ b/jjb/availability/availability.yml @@ -10,14 +10,13 @@ jobs: - 'availability-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'availability-verify-{stream}' diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml index 39325d4ce..b2c4b1f52 100644 --- a/jjb/conductor/conductor.yml +++ b/jjb/conductor/conductor.yml @@ -10,14 +10,13 @@ jobs: - 'conductor-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'conductor-verify-{stream}' diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml index fc27d9cd6..1b16864b8 100644 --- a/jjb/copper/copper.yml +++ b/jjb/copper/copper.yml @@ -10,14 +10,13 @@ jobs: - 'copper-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'copper-verify-{stream}' diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index b2fba9840..4001ebf4e 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -10,14 +10,13 @@ jobs: - 'doctor-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'doctor-verify-{stream}' diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml index d503257dd..0258c23fd 100644 --- a/jjb/dpacc/dpacc.yml +++ b/jjb/dpacc/dpacc.yml @@ -10,14 +10,13 @@ jobs: - 'dpacc-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'dpacc-verify-{stream}' diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index a0ae806ad..5b2c9c2cf 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -10,14 +10,13 @@ jobs: - 'fastpathmetrics-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'fastpathmetrics-verify-{stream}' diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml index 7768f2de1..67bc7885e 100644 --- a/jjb/ipv6/ipv6.yml +++ b/jjb/ipv6/ipv6.yml @@ -10,14 +10,13 @@ jobs: - 'ipv6-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'ipv6-verify-{stream}' diff --git a/jjb/joid/joid-project-jobs.yml b/jjb/joid/joid-project-jobs.yml index 987b3f9e1..b314da1fa 100644 --- a/jjb/joid/joid-project-jobs.yml +++ b/jjb/joid/joid-project-jobs.yml @@ -10,14 +10,13 @@ jobs: - 'joid-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/{stream}' -# gs-pathname: '/{stream}' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'joid-verify-{stream}' diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 562003350..368dab54e 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -1,16 +1,19 @@ - project: name: kvmfornfv + + project: '{name}' + jobs: - 'kvmfornfv-verify-{stream}' - 'kvmfornfv-merge-{stream}' - # stream: branch with - in place of / (eg. stable-arno) - # branch: branch (eg. stable/arno) stream: - master: - branch: 'master' - - project: 'kvmfornfv' + branch: '{stream}' + gs-pathname: '' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'kvmfornfv-verify-{stream}' @@ -21,7 +24,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -47,10 +50,10 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: 'kvmfornfv' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: @@ -59,17 +62,13 @@ - job-template: name: 'kvmfornfv-merge-{stream}' - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB - node: ericsson-build parameters: - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -89,10 +88,10 @@ comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' - project-pattern: 'kvmfornfv' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index 3aa422b38..cceda50aa 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -9,14 +9,13 @@ jobs: - 'octopus-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'octopus-verify-{stream}' diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index f29219c97..d0c180c5b 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -8,14 +8,13 @@ - 'ovsnfv-merge-{stream}' - 'ovsnfv-daily-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/{stream}' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'ovsnfv-verify-{stream}' diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index 9913c0315..5e603f026 100644 --- a/jjb/parser/parser.yml +++ b/jjb/parser/parser.yml @@ -10,14 +10,13 @@ jobs: - 'parser-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'parser-verify-{stream}' diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 30172cdd8..3bef22578 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -10,14 +10,13 @@ jobs: - 'pharos-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'pharos-verify-{stream}' diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml index 7a47bc11e..f8fdceb81 100644 --- a/jjb/prediction/prediction.yml +++ b/jjb/prediction/prediction.yml @@ -10,14 +10,13 @@ jobs: - 'prediction-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'prediction-verify-{stream}' diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml index d057f3f2f..7999fb5ce 100644 --- a/jjb/promise/promise.yml +++ b/jjb/promise/promise.yml @@ -10,14 +10,13 @@ jobs: - 'promise-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'promise-verify-{stream}' diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index dd00474e4..fffca10cc 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -1,17 +1,20 @@ - project: name: storperf + + project: '{name}' + jobs: - 'storperf-verify-{stream}' - 'storperf-merge-{stream}' - 'storperf-daily-{stream}' - # stream: branch with - in place of / (eg. stable-arno) - # branch: branch (eg. stable/arno) stream: - master: - branch: 'master' - - project: 'storperf' + branch: '{stream}' + gs-pathname: '' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: name: 'storperf-verify-{stream}' @@ -22,7 +25,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -48,10 +51,10 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: 'storperf' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: | @@ -90,10 +93,10 @@ comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' - project-pattern: 'storperf' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: | diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml index de63c4eeb..0123fcdf9 100644 --- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml +++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml @@ -1,71 +1,27 @@ - project: name: vnf_forwarding_graph + + project: '{name}' + jobs: - - 'vnf_forwarding_graph-test' - - 'vnf_forwarding_graph-daily-{stream}' - - 'vnf_forwarding_graph-merge' - - 'vnf_forwarding_graph-verify' + - 'vnf_forwarding_graph-verify-{stream}' - # stream: branch with - in place of / (eg. stable-helium) - # branch: branch (eg. stable/helium) stream: - master: - branch: 'master' - - project: 'vnf_forwarding_graph' - somevar: 'foo' - -- job-template: - name: vnf_forwarding_graph-test - - builders: - - shell: | - echo "Hello world from vnf_forwarding_graph" - -- job-template: - name: 'vnf_forwarding_graph-daily-{stream}' - - # Job template for daily builders - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - # branch: branch (eg. stable) - - varsetabove: '{somevar}' - - parameters: - - project-parameter: - project: '{project}' - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - - triggers: - - timed: 'H H * * *' - - prebuilders: - - test-macro - - builders: - - shell: | - pwd - find . - echo "Hello world from vnf_forwarding_graph {somevar} daily" - - postbuilders: - - test-macro + branch: '{stream}' + gs-pathname: '' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: - name: 'vnf_forwarding_graph-verify' + name: 'vnf_forwarding_graph-verify-{stream}' parameters: - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -86,52 +42,11 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: 'vnf_forwarding_graph' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' - - builders: - - shell: | - pwd - find . - echo "verify logic goes here" - -- job-template: - name: 'vnf_forwarding_graph-merge' - - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: 'master' - - 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: 'vnf_forwarding_graph' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: | - pwd - find . - echo "merge logic goes here" - + echo "Nothing to verify!" diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 16b7d9e75..4b1147d36 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -9,14 +9,13 @@ - 'vswitchperf-merge-{stream}' - 'vswitchperf-daily-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' - job-template: diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index 193b69284..4f978e189 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -11,14 +11,13 @@ - 'yardstick-verify-{stream}' - 'yardstick-merge-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' -# - brahmaputra: -# branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' ################################ # job templates |