From c44f96b50c89933c3fed3609d6b69fc9322c5818 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Sun, 13 Dec 2015 01:48:32 +0100 Subject: [PATCH] Fix branch parameter and change stream name to brahmaputra Change-Id: I9005cb7cee44873b37fb310e5850d85d887c958d Signed-off-by: Fatih Degirmenci --- jjb/armband/armband.yml | 6 +++--- jjb/availability/availability.yml | 6 +++--- jjb/bottlenecks/bottlenecks.yml | 6 +++--- jjb/compass4nfv/compass4nfv.yml | 2 +- jjb/conductor/conductor.yml | 6 +++--- jjb/copper/copper.yml | 6 +++--- jjb/doctor/doctor.yml | 6 +++--- jjb/dpacc/dpacc.yml | 6 +++--- jjb/fastpathmetrics/fastpathmetrics.yml | 6 +++--- jjb/ipv6/ipv6.yml | 6 +++--- jjb/octopus/octopus.yml | 6 +++--- jjb/oscar/oscar.yml | 6 +++--- jjb/ovsnfv/ovsnfv.yml | 14 +++++++------- jjb/parser/parser.yml | 6 +++--- jjb/pharos/pharos.yml | 6 +++--- jjb/prediction/prediction.yml | 6 +++--- jjb/promise/promise.yml | 6 +++--- jjb/qtip/qtip.yml | 6 +++--- 18 files changed, 56 insertions(+), 56 deletions(-) diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml index 1ffc8ac8e..c35f28784 100644 --- a/jjb/armband/armband.yml +++ b/jjb/armband/armband.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml index 763a43c6b..2f0812b84 100644 --- a/jjb/availability/availability.yml +++ b/jjb/availability/availability.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml index 15aceefcd..e96147848 100644 --- a/jjb/bottlenecks/bottlenecks.yml +++ b/jjb/bottlenecks/bottlenecks.yml @@ -21,7 +21,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -36,7 +36,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -62,7 +62,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 1265bf080..40402011c 100644 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -17,7 +17,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml index 5acfef343..39325d4ce 100644 --- a/jjb/conductor/conductor.yml +++ b/jjb/conductor/conductor.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml index 5a1077fb9..fc27d9cd6 100644 --- a/jjb/copper/copper.yml +++ b/jjb/copper/copper.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 86f0fadc7..b2fba9840 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml index ead48fb73..d503257dd 100644 --- a/jjb/dpacc/dpacc.yml +++ b/jjb/dpacc/dpacc.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index 5bac3192f..a0ae806ad 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml index 47f4c8237..7768f2de1 100644 --- a/jjb/ipv6/ipv6.yml +++ b/jjb/ipv6/ipv6.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index 7e05900bd..3aa422b38 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -14,7 +14,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -25,7 +25,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -51,7 +51,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/oscar/oscar.yml b/jjb/oscar/oscar.yml index 02956741a..786d44b3e 100644 --- a/jjb/oscar/oscar.yml +++ b/jjb/oscar/oscar.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index 83bab98b3..00417eb0b 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -13,7 +13,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -24,7 +24,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' - 'intel-us-build-2-defaults' scm: @@ -47,10 +47,10 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: 'ovsnfv' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: | @@ -69,7 +69,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' - 'intel-us-build-2-defaults' scm: @@ -86,10 +86,10 @@ comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' - project-pattern: 'ovsnfv' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' builders: - shell: | diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index 663ea2da3..9913c0315 100644 --- a/jjb/parser/parser.yml +++ b/jjb/parser/parser.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 011a28a40..30172cdd8 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml index 4566f871f..7a47bc11e 100644 --- a/jjb/prediction/prediction.yml +++ b/jjb/prediction/prediction.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml index 21e5b66a4..d057f3f2f 100644 --- a/jjb/promise/promise.yml +++ b/jjb/promise/promise.yml @@ -15,7 +15,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -26,7 +26,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -52,7 +52,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml index 9388f388b..fac9c333c 100644 --- a/jjb/qtip/qtip.yml +++ b/jjb/qtip/qtip.yml @@ -19,7 +19,7 @@ - master: branch: 'master' gs-pathname: '' -# - stable-brahmaputra: +# - brahmaputra: # branch: 'stable/brahmaputra' # gs-pathname: '/brahmaputra' @@ -30,7 +30,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: '{stream}' + branch: '{branch}' - 'opnfv-build-defaults' scm: @@ -56,7 +56,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/{stream}' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' -- 2.16.6