diff options
29 files changed, 170 insertions, 38 deletions
diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml index 0d887e760..c42efff11 100644 --- a/jjb/availability/availability.yml +++ b/jjb/availability/availability.yml @@ -14,13 +14,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: 'false' + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: 'false' - job-template: name: 'availability-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml index 28b49bc8b..fffc22def 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml @@ -19,10 +19,12 @@ gs-pathname: '' #This is used for different test suite dependent packages storage gs-packagepath: '/{suite}' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' gs-packagepath: '/{stream}/{suite}' + disabled: false suite: - 'rubbos' @@ -35,6 +37,8 @@ - job-template: name: 'bottlenecks-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' @@ -74,6 +78,8 @@ - job-template: name: 'bottlenecks-merge-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' @@ -107,6 +113,9 @@ - job-template: name: 'bottlenecks-{suite}-upload-artifacts-{stream}' + + disabled: '{obj:disabled}' + concurrent: true properties: diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml index 247f4f268..a5f556ad8 100644 --- a/jjb/conductor/conductor.yml +++ b/jjb/conductor/conductor.yml @@ -14,13 +14,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'conductor-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml index 8aad3f26b..b5045785c 100644 --- a/jjb/copper/copper.yml +++ b/jjb/copper/copper.yml @@ -14,13 +14,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'copper-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index cf9f6430b..3b407efc9 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -10,13 +10,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'doctor-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/domino/domino.yml b/jjb/domino/domino.yml index 29e171b80..7cee98448 100644 --- a/jjb/domino/domino.yml +++ b/jjb/domino/domino.yml @@ -10,10 +10,17 @@ - master: branch: '{stream}' gs-pathname: '' + disabled: false + - colorado: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - job-template: name: 'domino-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml index 9d788ba0b..c660af57d 100644 --- a/jjb/dpacc/dpacc.yml +++ b/jjb/dpacc/dpacc.yml @@ -14,13 +14,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'dpacc-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index 40549e3c5..504e07f25 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -17,10 +17,10 @@ branch: '{stream}' gs-pathname: '' disabled: false - - brahmaputra: + - colorado: branch: '{stream}' - gs-pathname: '' - disabled: true + gs-pathname: '/{stream}' + disabled: false - job-template: name: 'fastpathmetrics-verify-{stream}' diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index 7f86281fc..a9845459f 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -14,13 +14,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'functest-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml index 5b9691257..d9dafdf69 100644 --- a/jjb/ipv6/ipv6.yml +++ b/jjb/ipv6/ipv6.yml @@ -14,13 +14,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'ipv6-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 5fcb27042..4bb0a15b4 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -8,10 +8,10 @@ branch: '{stream}' gs-pathname: '' disabled: false - - brahmaputra: + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: true + disabled: false ##################################### # patch verification phases ##################################### @@ -139,6 +139,8 @@ - job-template: name: 'kvmfornfv-merge-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/multisite/multisite.yml b/jjb/multisite/multisite.yml index 00b211ceb..fc1e0ef12 100644 --- a/jjb/multisite/multisite.yml +++ b/jjb/multisite/multisite.yml @@ -17,12 +17,18 @@ branch: '{stream}' gs-pathname: '' disabled: false + - colorado: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - job-template: name: 'multisite-verify-{stream}' disabled: '{obj:disabled}' + concurrent: true + parameters: - project-parameter: project: '{project}' diff --git a/jjb/netready/netready.yml b/jjb/netready/netready.yml index bc8f66691..3e2f95a76 100644 --- a/jjb/netready/netready.yml +++ b/jjb/netready/netready.yml @@ -10,13 +10,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'netready-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index 1cb71cc69..c4e34ca7d 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -13,13 +13,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'octopus-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml index 8c23b0832..0c90c577a 100644 --- a/jjb/onosfw/onosfw.yml +++ b/jjb/onosfw/onosfw.yml @@ -10,11 +10,13 @@ # 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' + disabled: false + - colorado: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false project: 'onosfw' @@ -24,6 +26,8 @@ - job-template: name: 'onosfw-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' @@ -65,6 +69,8 @@ - job-template: name: 'onosfw-daily-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' @@ -88,6 +94,8 @@ - job-template: name: 'onosfw-build-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml index 6b4861c01..4250eef64 100644 --- a/jjb/opnfv/opnfv-docker.yml +++ b/jjb/opnfv/opnfv-docker.yml @@ -20,8 +20,10 @@ stream: - master: branch: '{stream}' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' + disabled: false ######################## # job templates @@ -29,7 +31,7 @@ - job-template: name: '{project}-docker-build-push-{stream}' - disabled: false + disabled: '{obj:disabled}' parameters: - project-parameter: @@ -41,7 +43,7 @@ description: "To enable/disable pushing the image to Dockerhub." - string: name: BASE_VERSION - default: "brahmaputra.3" + default: "colorado.0" description: "Base version to be used." - string: name: DOCKER_REPO_NAME @@ -72,7 +74,7 @@ - job-template: name: 'yardstick-docker-build-push-{stream}' - disabled: false + disabled: '{obj:disabled}' parameters: - project-parameter: @@ -84,7 +86,7 @@ description: "To enable/disable pushing the image to Dockerhub." - string: name: BASE_VERSION - default: "brahmaputra.3" + default: "colorado.0" description: "Base version to be used." - string: name: DOCKER_REPO_NAME diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index 2b80b84f0..743657334 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -15,9 +15,11 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false ######################## # job templates @@ -26,6 +28,8 @@ - job-template: name: 'opnfv-docs-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: $GERRIT_PROJECT @@ -68,6 +72,8 @@ - job-template: name: 'opnfv-docs-merge-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: $GERRIT_PROJECT diff --git a/jjb/opnfv/opnfv-lint.yml b/jjb/opnfv/opnfv-lint.yml index cda882e32..f90f95dc2 100644 --- a/jjb/opnfv/opnfv-lint.yml +++ b/jjb/opnfv/opnfv-lint.yml @@ -14,9 +14,11 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false ######################## # job templates @@ -25,6 +27,8 @@ - job-template: name: 'opnfv-lint-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: $GERRIT_PROJECT diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml index f3e776c83..2bf87c2f4 100644 --- a/jjb/opnfvdocs/opnfvdocs.yml +++ b/jjb/opnfvdocs/opnfvdocs.yml @@ -16,9 +16,11 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false ######################## # job templates @@ -27,6 +29,8 @@ - job-template: name: 'opnfvdocs-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: $GERRIT_PROJECT @@ -68,6 +72,8 @@ - job-template: name: 'opnfvdocs-merge-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: $GERRIT_PROJECT diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index ec5761b74..c6f3e4a51 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -13,14 +13,16 @@ branch: '{stream}' gs-pathname: '' disabled: false - - brahmaputra: + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: true + disabled: false - job-template: name: 'ovsnfv-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' @@ -68,6 +70,8 @@ - job-template: name: 'ovsnfv-merge-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index 8c7283802..7f73a1380 100644 --- a/jjb/parser/parser.yml +++ b/jjb/parser/parser.yml @@ -14,13 +14,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'parser-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 98d71286c..f7ea622e1 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -14,13 +14,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'pharos-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml index b6471bf9f..a95cd98da 100644 --- a/jjb/prediction/prediction.yml +++ b/jjb/prediction/prediction.yml @@ -14,13 +14,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'prediction-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml index 97a8b3eb3..1a4d628fd 100644 --- a/jjb/promise/promise.yml +++ b/jjb/promise/promise.yml @@ -14,13 +14,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'promise-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml index 75f75116a..722a9beb3 100644 --- a/jjb/qtip/qtip-project-jobs.yml +++ b/jjb/qtip/qtip-project-jobs.yml @@ -11,13 +11,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'qtip-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index fb70df751..026b643d3 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -12,13 +12,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'storperf-verify-{stream}' + disabled: '{obj:disabled}' + node: opnfv-build-ubuntu parameters: diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml index 0123fcdf9..c988c0627 100644 --- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml +++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml @@ -10,13 +10,17 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'vnf_forwarding_graph-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index bf2fe8faa..363423de9 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -13,14 +13,18 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false - job-template: name: 'vswitchperf-daily-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' @@ -50,6 +54,8 @@ - job-template: name: 'vswitchperf-verify-{stream}' + disabled: '{obj:disabled}' + project-type: freestyle concurrent: true @@ -108,6 +114,8 @@ - job-template: name: 'vswitchperf-merge-{stream}' + disabled: '{obj:disabled}' + project-type: freestyle concurrent: true diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index 64031b75a..db07e9d83 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -15,9 +15,11 @@ - master: branch: '{stream}' gs-pathname: '' - - brahmaputra: + disabled: false + - colorado: branch: 'stable/{stream}' gs-pathname: '/{stream}' + disabled: false ################################ # job templates @@ -26,6 +28,8 @@ - job-template: name: 'yardstick-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' @@ -63,6 +67,8 @@ - job-template: name: 'yardstick-merge-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' |