From: Thanh Ha Date: Mon, 7 Nov 2016 19:04:34 +0000 (-0500) Subject: Simplify val-autorelease and distro-check state definition X-Git-Tag: release/boron-sr2~70 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e5ebb1faf1e71657113c709ef811a25242780862;p=releng%2Fbuilder.git Simplify val-autorelease and distro-check state definition The validate-autorelease and distribution-check jobs use a activate/disable mechanism from before when releng/builder was using a custom scripting layer. This is no longer needed as projects can just remove the unneeded templates directly in their 'project' definition jjb so let's simplify the JJB code by removing the complexity here. Also simplify streams to no longer be a list as that is no longer necessary with the way we are now defining project definitions. - templates now have a setting of 'disabled: false' to ensure they are always enabled if defined. - remove validate-autorelease and distro-check templates from projects that are not participating in the distribution / autorelease. - enable validate-autorelease job on projects that are participating in the distribution / autorelease but mistakenly had those jobs disabled. Change-Id: Ia4edb4ad0207ddcf9ca4508886fb3f37488f4788 Signed-off-by: Thanh Ha --- diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 29d219139..b62cb1d53 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'aaa' project-name: 'aaa' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'aaa' project-name: 'aaa' branch: 'stable/boron' @@ -76,11 +68,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False - + stream: beryllium project: 'aaa' project-name: 'aaa' branch: 'stable/beryllium' diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 6f5eeb393..4678a30fc 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'alto' project-name: 'alto' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'alto' project-name: 'alto' branch: 'stable/boron' @@ -76,11 +68,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False - + stream: beryllium project: 'alto' project-name: 'alto' branch: 'stable/beryllium' diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml index 0fbb7e5d4..9775fc1c6 100644 --- a/jjb/armoury/armoury.yaml +++ b/jjb/armoury/armoury.yaml @@ -3,18 +3,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: True - disable_distribution_check: False - + stream: carbon project: 'armoury' project-name: 'armoury' branch: 'master' @@ -37,18 +31,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: True - disable_distribution_check: False - + stream: boron project: 'armoury' project-name: 'armoury' branch: 'stable/boron' @@ -71,18 +59,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: True - disable_distribution_check: False - + stream: beryllium project: 'armoury' project-name: 'armoury' branch: 'stable/beryllium' diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 79695fd90..48099cfe4 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: True - disable_distribution_check: False - + stream: carbon project: 'atrium' project-name: 'atrium' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: True - disable_distribution_check: False - + stream: boron project: 'atrium' project-name: 'atrium' branch: 'stable/boron' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 780793927..8da543e96 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'bgpcep' project-name: 'bgpcep' build-node: centos7-java-builder-4c-8g @@ -44,11 +40,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'bgpcep' project-name: 'bgpcep' build-node: centos7-java-builder-4c-8g @@ -79,11 +71,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False - + stream: beryllium project: 'bgpcep' project-name: 'bgpcep' branch: 'stable/beryllium' diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index cdb8ce2c0..965d6a0f7 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'capwap' project-name: 'capwap' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'capwap' project-name: 'capwap' branch: 'stable/boron' @@ -76,11 +68,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False - + stream: beryllium project: 'capwap' project-name: 'capwap' branch: 'stable/beryllium' diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index e7f824cc7..ef84cca92 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'cardinal' project-name: 'cardinal' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'cardinal' project-name: 'cardinal' branch: 'stable/boron' diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 56ace49ef..2da513bd3 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'centinel' project-name: 'centinel' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'centinel' project-name: 'centinel' branch: 'stable/boron' @@ -76,11 +68,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False - + stream: beryllium project: 'centinel' project-name: 'centinel' branch: 'stable/beryllium' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 2b933c2a3..bbfcb824e 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'controller' project-name: 'controller' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'controller' project-name: 'controller' branch: 'stable/boron' @@ -76,11 +68,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False - + stream: beryllium project: 'controller' project-name: 'controller' branch: 'stable/beryllium' diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 872737e1c..178a69c87 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -3,18 +3,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: True - disable_distribution_check: False - + stream: carbon project: 'coretutorials' project-name: 'coretutorials' branch: 'master' @@ -36,18 +30,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: True - disable_distribution_check: False - + stream: boron project: 'coretutorials' project-name: 'coretutorials' branch: 'stable/boron' @@ -69,18 +57,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: True - disable_distribution_check: False - + stream: beryllium project: 'coretutorials' project-name: 'coretutorials' branch: 'stable/beryllium' diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index d268c69b1..bd2110405 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'didm' project-name: 'didm' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'didm' project-name: 'didm' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'didm' project-name: 'didm' branch: 'stable/beryllium' diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml index 440140cb5..4082cfe26 100644 --- a/jjb/discovery/discovery.yaml +++ b/jjb/discovery/discovery.yaml @@ -3,17 +3,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: True - disable_distribution_check: False + stream: carbon project: 'discovery' project-name: 'discovery' branch: 'master' @@ -35,17 +30,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: True - disable_distribution_check: False + stream: boron project: 'discovery' project-name: 'discovery' branch: 'stable/boron' @@ -67,16 +57,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: True - disable_distribution_check: False + + stream: beryllium project: 'discovery' project-name: 'discovery' branch: 'stable/beryllium' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index edf8f0470..b46beb5d1 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'dlux' project-name: 'dlux' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'dlux' project-name: 'dlux' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'dlux' project-name: 'dlux' branch: 'stable/beryllium' diff --git a/jjb/docs/docs.yaml b/jjb/docs/docs.yaml index d911c4a49..cfa42e27f 100644 --- a/jjb/docs/docs.yaml +++ b/jjb/docs/docs.yaml @@ -3,16 +3,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: True + + stream: beryllium project: 'docs' project-name: 'docs' branch: 'stable/beryllium' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index 19762ba5f..da00b8655 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'eman' project-name: 'eman' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'eman' project-name: 'eman' branch: 'stable/boron' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 68c077875..444d57436 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'faas' project-name: 'faas' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'faas' project-name: 'faas' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'faas' project-name: 'faas' branch: 'stable/beryllium' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index b88de70de..e8585f8a6 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'genius' project-name: 'genius' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'genius' project-name: 'genius' branch: 'stable/boron' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 063199e1f..32a3ca230 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'groupbasedpolicy' project-name: 'groupbasedpolicy' branch: 'stable/beryllium' diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index fe4eb582a..aff5eacb6 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'honeycomb/vbd' project-name: 'vbd' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'honeycomb/vbd' project-name: 'vbd' branch: 'stable/boron' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 8d72f8723..1aedf2d1b 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'infrautils' project-name: 'infrautils' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'infrautils' project-name: 'infrautils' branch: 'stable/boron' @@ -62,7 +56,6 @@ email-upstream: '[infrautils] [odlparent]' archive-artifacts: '' - - project: name: infrautils-sonar jobs: diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml index 100acd9e9..deed0abec 100644 --- a/jjb/integration/distribution/distribution.yaml +++ b/jjb/integration/distribution/distribution.yaml @@ -12,23 +12,17 @@ jdk: openjdk8 jdks: - openjdk8 - disable_autorelease: False - disable_distribution_check: False - boron: branch: 'stable/boron' jdk: openjdk8 jdks: - openjdk8 - disable_autorelease: False - disable_distribution_check: False - beryllium: branch: 'stable/beryllium' jdk: openjdk8 jdks: - openjdk8 - openjdk7 - disable_autorelease: False - disable_distribution_check: False project: 'integration/distribution' project-name: 'distribution' diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 513b0e7b9..a1cd6fd49 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'iotdm' project-name: 'iotdm' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'iotdm' project-name: 'iotdm' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'iotdm' project-name: 'iotdm' branch: 'stable/beryllium' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index b49e327a2..79ad710e2 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'l2switch' project-name: 'l2switch' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'l2switch' project-name: 'l2switch' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'l2switch' project-name: 'l2switch' branch: 'stable/beryllium' diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 1c3d3a950..e2aeb79dc 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'lacp' project-name: 'lacp' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'lacp' project-name: 'lacp' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'lacp' project-name: 'lacp' branch: 'stable/beryllium' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index c0202de72..28f1e07fc 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'lispflowmapping' project-name: 'lispflowmapping' branch: 'master' @@ -43,10 +40,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'lispflowmapping' project-name: 'lispflowmapping' branch: 'stable/boron' @@ -75,10 +69,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'lispflowmapping' project-name: 'lispflowmapping' branch: 'stable/beryllium' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index e7d94b8c1..33c6e8187 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'mdsal' project-name: 'mdsal' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'mdsal' project-name: 'mdsal' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'mdsal' project-name: 'mdsal' branch: 'stable/beryllium' diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 1c488c94c..9e1fcea40 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'messaging4transport' project-name: 'messaging4transport' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'messaging4transport' project-name: 'messaging4transport' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'messaging4transport' project-name: 'messaging4transport' branch: 'stable/beryllium' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 106d0567b..75abb9dc7 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'natapp' project-name: 'natapp' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'natapp' project-name: 'natapp' branch: 'stable/boron' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 1b7abd66c..f7a2173cc 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'nemo' project-name: 'nemo' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'nemo' project-name: 'nemo' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'nemo' project-name: 'nemo' branch: 'stable/beryllium' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index e76944682..844b9e5bf 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'netconf' project-name: 'netconf' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'netconf' project-name: 'netconf' branch: 'stable/boron' @@ -73,16 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - branch: 'stable/beryllium' - jdk: openjdk7 - jdks: - - openjdk7 - - openjdk8 - disable_autorelease: False - disable_distribution_check: False + stream: beryllium project: 'netconf' project-name: 'netconf' branch: 'stable/beryllium' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index f3092245f..0f8410b76 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'netide' project-name: 'netide' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'netide' project-name: 'netide' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'netide' project-name: 'netide' branch: 'stable/beryllium' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 6d1f146af..5b5e36b35 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'netvirt' project-name: 'netvirt' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'netvirt' project-name: 'netvirt' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'netvirt' project-name: 'netvirt' branch: 'stable/beryllium' @@ -97,18 +89,12 @@ - project: name: netvirt-routermanager jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - routermanager: - disable_autorelease: False - disable_distribution_check: False + + stream: routermanager project: 'netvirt' project-name: 'netvirt' branch: 'topic/routermanager' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 19071b7d5..ba63ab01a 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'neutron' project-name: 'neutron' build-timeout: 60 @@ -43,10 +40,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'neutron' project-name: 'neutron' branch: 'stable/boron' @@ -74,10 +68,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'neutron' project-name: 'neutron' branch: 'stable/beryllium' diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index fdd39688e..0ce4a4f76 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'next' project-name: 'next' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'next' project-name: 'next' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'next' project-name: 'next' branch: 'stable/beryllium' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index a27668160..37114efc5 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'nic' project-name: 'nic' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'nic' project-name: 'nic' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'nic' project-name: 'nic' branch: 'stable/beryllium' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 84fa540c9..2d471064a 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'ocpplugin' project-name: 'ocpplugin' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'ocpplugin' project-name: 'ocpplugin' branch: 'stable/boron' diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index f5526715e..415dc824a 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'odlparent' project-name: 'odlparent' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'odlparent' project-name: 'odlparent' branch: 'stable/boron' @@ -76,11 +68,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False - + stream: beryllium project: 'odlparent' project-name: 'odlparent' branch: 'stable/beryllium' diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index dc823235b..0dfbb25ca 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'of-config' project-name: 'of-config' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'of-config' project-name: 'of-config' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'of-config' project-name: 'of-config' branch: 'stable/beryllium' diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index d4e676ebd..436c51870 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -3,17 +3,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'ofextensions/circuitsw' project-name: 'circuitsw' branch: 'master' @@ -35,17 +30,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'ofextensions/circuitsw' project-name: 'circuitsw' branch: 'stable/boron' @@ -67,16 +57,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: True - disable_distribution_check: False + + stream: beryllium project: 'ofextensions/circuitsw' project-name: 'circuitsw' branch: 'stable/beryllium' diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index afeedb98b..f3b1aa3b7 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'openflowjava' project-name: 'openflowjava' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'openflowjava' project-name: 'openflowjava' branch: 'stable/boron' @@ -73,11 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + stream: beryllium project: 'openflowjava' project-name: 'openflowjava' branch: 'stable/beryllium' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index b5f067f02..ae5fa779a 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'openflowplugin' project-name: 'openflowplugin' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'openflowplugin' project-name: 'openflowplugin' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'openflowplugin' project-name: 'openflowplugin' branch: 'stable/beryllium' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index e5791b883..6fd0e8099 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'ovsdb' project-name: 'ovsdb' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'ovsdb' project-name: 'ovsdb' branch: 'stable/boron' @@ -76,11 +68,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False - + stream: beryllium project: 'ovsdb' project-name: 'ovsdb' branch: 'stable/beryllium' diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 32dbb6cb5..6530b164b 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'packetcable' project-name: 'packetcable' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'packetcable' project-name: 'packetcable' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'packetcable' project-name: 'packetcable' branch: 'stable/beryllium' diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 08ad24273..70835525a 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -3,17 +3,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: True - disable_distribution_check: False + stream: carbon project: 'persistence' project-name: 'persistence' branch: 'master' @@ -36,17 +31,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: True - disable_distribution_check: False + stream: boron project: 'persistence' project-name: 'persistence' branch: 'stable/boron' @@ -69,16 +59,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: True - disable_distribution_check: False + + stream: beryllium project: 'persistence' project-name: 'persistence' branch: 'stable/beryllium' diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index 9904fa7b7..7f5e03675 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -135,7 +135,7 @@ # the patch, and triggers the distribution deploy test name: '{project-name}-distribution-check-{stream}' - disabled: '{obj:disable_distribution_check}' + disabled: false project-type: freestyle node: '{build-node}' @@ -554,7 +554,7 @@ - job-template: name: '{project-name}-validate-autorelease-{stream}' - disabled: '{obj:disable_autorelease}' + disabled: false project-type: freestyle node: '{build-node}' diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index f103c6c0b..015951783 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -3,17 +3,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'reservation' project-name: 'reservation' branch: 'master' @@ -35,17 +30,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'reservation' project-name: 'reservation' branch: 'stable/boron' @@ -67,16 +57,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'reservation' project-name: 'reservation' branch: 'stable/beryllium' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 98b63db98..a69769f0a 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'sdninterfaceapp' project-name: 'sdninterfaceapp' branch: 'stable/beryllium' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 588885324..85a605233 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -10,12 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-boron or beryllium) - # branch: git branch (eg. stable/boron or master) - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'sfc' project-name: 'sfc' branch: 'master' @@ -44,12 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - # stream: release stream (eg. stable-boron or beryllium) - # branch: git branch (eg. stable/boron or master) - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'sfc' project-name: 'sfc' branch: 'stable/boron' @@ -77,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'sfc' project-name: 'sfc' branch: 'stable/beryllium' diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index a1d9106ea..bc8f7ff9e 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'snbi' project-name: 'snbi' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'snbi' project-name: 'snbi' branch: 'stable/boron' @@ -74,10 +68,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'snbi' project-name: 'snbi' branch: 'stable/beryllium' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 918a3d51a..70cd239a5 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'snmp' project-name: 'snmp' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'snmp' project-name: 'snmp' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'snmp' project-name: 'snmp' branch: 'stable/beryllium' diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index a59c749ef..60eb79c02 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'snmp4sdn' project-name: 'snmp4sdn' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'snmp4sdn' project-name: 'snmp4sdn' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'snmp4sdn' project-name: 'snmp4sdn' branch: 'stable/beryllium' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index bae967075..6e98ba4f2 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'sxp' project-name: 'sxp' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'sxp' project-name: 'sxp' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'sxp' project-name: 'sxp' branch: 'stable/beryllium' diff --git a/jjb/tcpmd5/tcpmd5.yaml b/jjb/tcpmd5/tcpmd5.yaml index 2425a79da..10d2c689c 100644 --- a/jjb/tcpmd5/tcpmd5.yaml +++ b/jjb/tcpmd5/tcpmd5.yaml @@ -3,17 +3,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'tcpmd5' project-name: 'tcpmd5' branch: 'master' @@ -36,17 +31,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'tcpmd5' project-name: 'tcpmd5' branch: 'stable/boron' @@ -75,10 +65,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'tcpmd5' project-name: 'tcpmd5' branch: 'stable/beryllium' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index c9170f7d1..fcc5b53e0 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'topoprocessing' project-name: 'topoprocessing' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'topoprocessing' project-name: 'topoprocessing' branch: 'stable/boron' @@ -76,11 +68,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + stream: beryllium project: 'topoprocessing' project-name: 'topoprocessing' branch: 'stable/beryllium' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 36ebeff23..5b552bc11 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'tsdr' project-name: 'tsdr' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'tsdr' project-name: 'tsdr' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'tsdr' project-name: 'tsdr' branch: 'stable/beryllium' diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 250c982e5..69e4c9a97 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'ttp' project-name: 'ttp' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'ttp' project-name: 'ttp' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'ttp' project-name: 'ttp' branch: 'stable/beryllium' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 0e35e0db0..165c3d6f0 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'unimgr' project-name: 'unimgr' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'unimgr' project-name: 'unimgr' branch: 'stable/boron' @@ -76,11 +68,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + stream: beryllium project: 'unimgr' project-name: 'unimgr' branch: 'stable/beryllium' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 90b163260..ac1e3830c 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'usc' project-name: 'usc' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'usc' project-name: 'usc' branch: 'stable/boron' @@ -73,10 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + + stream: beryllium project: 'usc' project-name: 'usc' branch: 'stable/beryllium' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index cf838c68a..fcc1717be 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'usecplugin' project-name: 'usecplugin' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'usecplugin' project-name: 'usecplugin' branch: 'stable/boron' @@ -73,11 +67,8 @@ - '{project-name}-periodic-{stream}' - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + stream: beryllium project: 'usecplugin' project-name: 'usecplugin' branch: 'stable/beryllium' @@ -95,7 +86,6 @@ email-upstream: '[usecplugin] [openflowplugin]' archive-artifacts: '' - - project: name: usecplugin-sonar jobs: diff --git a/jjb/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml index ea1a97090..2affc4247 100644 --- a/jjb/vpnservice/vpnservice.yaml +++ b/jjb/vpnservice/vpnservice.yaml @@ -3,17 +3,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'vpnservice' project-name: 'vpnservice' branch: 'master' @@ -35,17 +30,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'vpnservice' project-name: 'vpnservice' branch: 'stable/boron' @@ -74,10 +64,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + stream: beryllium project: 'vpnservice' project-name: 'vpnservice' branch: 'stable/beryllium' diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 0209c75bd..7009d994f 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'vtn' project-name: 'vtn' branch: 'master' @@ -46,10 +43,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'vtn' project-name: 'vtn' branch: 'stable/boron' @@ -82,11 +76,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False - + stream: beryllium project: 'vtn' project-name: 'vtn' branch: 'stable/beryllium' diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 9b6312b94..e4e7ea3fb 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -10,10 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False + stream: carbon project: 'yang-push' project-name: 'yang-push' branch: 'master' @@ -42,10 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False + stream: boron project: 'yang-push' project-name: 'yang-push' branch: 'stable/boron' @@ -74,10 +68,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False + stream: beryllium project: 'yang-push' project-name: 'yang-push' branch: 'stable/beryllium' diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index afd52bf4a..47fbc3cb9 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -3,18 +3,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: True - disable_distribution_check: True - + stream: carbon project: 'yangide' project-name: 'yangide' branch: 'master' @@ -36,18 +30,12 @@ jobs: - '{project-name}-clm-{stream}' - '{project-name}-distribution-{stream}' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-merge-{stream}' - '{project-name}-periodic-{stream}' - - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: True - disable_distribution_check: True - + stream: boron project: 'yangide' project-name: 'yangide' branch: 'stable/boron' diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 936624b7a..10a036cb6 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -10,11 +10,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - carbon: - disable_autorelease: False - disable_distribution_check: False - + stream: carbon project: 'yangtools' project-name: 'yangtools' branch: 'master' @@ -43,11 +39,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - boron: - disable_autorelease: False - disable_distribution_check: False - + stream: boron project: 'yangtools' project-name: 'yangtools' branch: 'stable/boron' @@ -78,11 +70,7 @@ - '{project-name}-validate-autorelease-{stream}' - '{project-name}-verify-{stream}-{maven}-{jdks}' - stream: - - beryllium: - disable_autorelease: False - disable_distribution_check: False - + stream: beryllium project: 'yangtools' project-name: 'yangtools' branch: 'stable/beryllium'