From: Jamo Luhrsen Date: Tue, 7 Nov 2017 02:21:38 +0000 (+0000) Subject: Merge "Migrate sdni-app to global-jjb Maven jobs" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c03576911610994112946c41fab2fbe5d7966584;hp=9e82af03f5c576edf41f55b1c7164870b835f237;p=releng%2Fbuilder.git Merge "Migrate sdni-app to global-jjb Maven jobs" --- diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 5da35e7d0..53a646385 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -2,13 +2,11 @@ - project: name: mdsal-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-verify-dependencies + - '{project-name}-merge-{stream}' stream: oxygen project: 'mdsal' @@ -26,14 +24,17 @@ email-upstream: '[mdsal] [odlparent] [yangtools]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a674173c7b29d + - project: name: mdsal-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'mdsal' @@ -51,14 +52,17 @@ email-upstream: '[mdsal] [odlparent] [yangtools]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a674173c7b29d + - project: name: mdsal-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'mdsal' @@ -77,6 +81,9 @@ email-upstream: '[mdsal] [odlparent] [yangtools]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a674173c7b29d + - project: name: mdsal-sonar jobs: diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 95a1ac9b6..8f4e37f58 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -2,11 +2,11 @@ - project: name: messaging4transport-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: oxygen project: 'messaging4transport' @@ -24,14 +24,17 @@ email-upstream: '[messaging4transport]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a677283157db4 + - project: name: messaging4transport-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'messaging4transport' @@ -49,14 +52,17 @@ email-upstream: '[messaging4transport]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a677283157db4 + - project: name: messaging4transport-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'messaging4transport' @@ -75,6 +81,9 @@ email-upstream: '[messaging4transport]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a677283157db4 + - project: name: messaging4transport-sonar jobs: diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index f08601eb8..f2c425a5e 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -2,11 +2,11 @@ - project: name: natapp-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: oxygen project: 'natapp' @@ -24,14 +24,17 @@ email-upstream: '[natapp] [openflowplugin]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a679c0f4f08a8 + - project: name: natapp-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'natapp' @@ -49,14 +52,17 @@ email-upstream: '[natapp] [openflowplugin]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a679c0f4f08a8 + - project: name: natapp-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'natapp' @@ -75,6 +81,9 @@ email-upstream: '[natapp] [openflowplugin]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a679c0f4f08a8 + - project: name: natapp-sonar jobs: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index ef1b6c17e..34866e5e6 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -2,12 +2,10 @@ - project: name: nemo-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - gerrit-maven-verify-dependencies stream: oxygen project: 'nemo' @@ -25,14 +23,16 @@ email-upstream: '[nemo]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67a9890f6202 + - project: name: nemo-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'nemo' @@ -50,14 +50,16 @@ email-upstream: '[nemo]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67a9890f6202 + - project: name: nemo-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'nemo' @@ -76,6 +78,9 @@ email-upstream: '[nemo]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67a9890f6202 + - project: name: nemo-sonar jobs: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index a3379305a..197c84126 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -2,12 +2,10 @@ - project: name: netconf-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - gerrit-maven-verify-dependencies stream: oxygen project: 'netconf' @@ -25,14 +23,16 @@ email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67b22fc3663f + - project: name: netconf-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'netconf' @@ -50,14 +50,16 @@ email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67b22fc3663f + - project: name: netconf-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'netconf' @@ -76,6 +78,9 @@ email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67b22fc3663f + - project: name: netconf-sonar jobs: diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index eaed56d4a..cd916644a 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -2,11 +2,10 @@ - project: name: netide-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: oxygen project: 'netide' @@ -24,14 +23,16 @@ email-upstream: '[netide] [openflowjava]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67bab3755815 + - project: name: netide-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'netide' @@ -49,14 +50,16 @@ email-upstream: '[netide] [openflowjava]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67bab3755815 + - project: name: netide-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'netide' @@ -75,6 +78,9 @@ email-upstream: '[netide] [openflowjava]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67bab3755815 + - project: name: netide-sonar jobs: diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 744fb6a84..904a15387 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -5,10 +5,9 @@ - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-verify-dependencies + - '{project-name}-merge-{stream}' - gerrit-tox-verify stream: @@ -39,10 +38,13 @@ email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67da0ffbb1ba + - project: name: netvirt-vpp jobs: - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - gerrit-maven-verify stream: vpp project: 'netvirt' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 855b2bdc4..8d0548052 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -2,13 +2,11 @@ - project: name: neutron-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - gerrit-maven-verify-dependencies stream: oxygen project: 'neutron' @@ -27,15 +25,17 @@ email-upstream: '[neutron] [odlparent] [aaa]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67e1b40d7419 + - project: name: neutron-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'neutron' @@ -54,15 +54,17 @@ email-upstream: '[neutron] [odlparent] [aaa]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67e1b40d7419 + - project: name: neutron-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'neutron' @@ -82,6 +84,9 @@ email-upstream: '[neutron] [odlparent] [aaa]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67e1b40d7419 + - project: name: neutron-sonar jobs: diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index bab60f9f3..e31e11ac8 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -2,11 +2,10 @@ - project: name: next-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: oxygen project: 'next' @@ -24,14 +23,16 @@ email-upstream: '[next]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67e7c516f385 + - project: name: next-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'next' @@ -49,14 +50,16 @@ email-upstream: '[next]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67e7c516f385 + - project: name: next-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'next' @@ -75,6 +78,9 @@ email-upstream: '[next]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67e7c516f385 + - project: name: next-sonar jobs: diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 0573c3760..b4aa09aab 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -2,12 +2,10 @@ - project: name: nic-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - gerrit-maven-verify-dependencies stream: oxygen project: 'nic' @@ -25,14 +23,16 @@ email-upstream: '[nic] [vtn] [groupbasedpolicy]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67ef386204aa + - project: name: nic-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'nic' @@ -50,14 +50,16 @@ email-upstream: '[nic] [vtn] [groupbasedpolicy]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67ef386204aa + - project: name: nic-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'nic' @@ -76,6 +78,9 @@ email-upstream: '[nic] [vtn] [groupbasedpolicy]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a67ef386204aa + - project: name: nic-sonar jobs: diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 48fd9b149..3119c12f8 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -2,12 +2,10 @@ - project: name: ocpplugin-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - gerrit-maven-verify-dependencies stream: oxygen project: 'ocpplugin' @@ -25,14 +23,16 @@ email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a687673279f9c + - project: name: ocpplugin-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'ocpplugin' @@ -50,14 +50,16 @@ email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a687673279f9c + - project: name: ocpplugin-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'ocpplugin' @@ -76,6 +78,9 @@ email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a687673279f9c + - project: name: ocpplugin-sonar jobs: diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 4a56593fe..f4784289f 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -2,10 +2,9 @@ - project: name: circuitsw-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: oxygen project: 'ofextensions/circuitsw' @@ -23,13 +22,15 @@ email-upstream: '[circuitsw]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68970cf5b25c + - project: name: circuitsw-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'ofextensions/circuitsw' @@ -47,13 +48,15 @@ email-upstream: '[circuitsw]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68970cf5b25c + - project: name: circuitsw-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'ofextensions/circuitsw' @@ -71,6 +74,9 @@ email-upstream: '[circuitsw]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68970cf5b25c + - project: name: circuitsw-sonar jobs: diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index ca929de57..c2f1072d7 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -2,12 +2,11 @@ - project: name: openflowjava-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - '{project-name}-merge-{stream}' stream: nitrogen project: 'openflowjava' @@ -25,14 +24,17 @@ email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68a1507dae22 + - project: name: openflowjava-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'openflowjava' @@ -51,6 +53,9 @@ email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68a1507dae22 + - project: name: openflowjava-sonar jobs: diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 0d720a5e6..588a41b5a 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -2,13 +2,11 @@ - project: name: openflowplugin-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-verify-dependencies + - '{project-name}-merge-{stream}' stream: oxygen project: 'openflowplugin' @@ -30,14 +28,17 @@ email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' archive-artifacts: 'model/*/target/site/**' + # Used by the release job + staging-profile-id: a68a76dc1b44c + - project: name: openflowplugin-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'openflowplugin' @@ -59,14 +60,17 @@ email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' archive-artifacts: 'model/*/target/site/**' + # Used by the release job + staging-profile-id: a68a76dc1b44c + - project: name: openflowplugin-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'openflowplugin' @@ -89,6 +93,9 @@ email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' archive-artifacts: 'model/*/target/site/**' + # Used by the release job + staging-profile-id: a68a76dc1b44c + - project: name: openflowplugin-sonar jobs: diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 0cdae53de..79c14e350 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -2,13 +2,11 @@ - project: name: ovsdb-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - - gerrit-maven-verify-dependencies + - '{project-name}-merge-{stream}' stream: oxygen project: 'ovsdb' @@ -26,14 +24,17 @@ email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68b188166958 + - project: name: ovsdb-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'ovsdb' @@ -51,14 +52,17 @@ email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68b188166958 + - project: name: ovsdb-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'ovsdb' @@ -76,3 +80,6 @@ dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' archive-artifacts: '' + + # Used by the release job + staging-profile-id: a68b188166958 diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 50fedfac1..714034dbe 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -2,12 +2,11 @@ - project: name: p4plugin-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' + - '{project-name}-maven-javadoc-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - gerrit-maven-verify-dependencies stream: oxygen project: 'p4plugin' @@ -25,6 +24,9 @@ email-upstream: '[p4plugin]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68bf26e208d4 + - project: name: p4plugin-sonar jobs: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 2f5b98d6a..52e0376c9 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -2,12 +2,10 @@ - project: name: packetcable-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' - - gerrit-maven-verify-dependencies stream: oxygen project: 'packetcable' @@ -25,14 +23,16 @@ email-upstream: '[packetcable]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68ca4a24655c + - project: name: packetcable-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'packetcable' @@ -50,14 +50,16 @@ email-upstream: '[packetcable]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68ca4a24655c + - project: name: packetcable-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'packetcable' @@ -76,6 +78,9 @@ email-upstream: '[packetcable]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68ca4a24655c + - project: name: packetcable-sonar jobs: diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 2afdd2a72..6342cc935 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -2,10 +2,9 @@ - project: name: persistence-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: oxygen project: 'persistence' @@ -25,13 +24,15 @@ email-upstream: '[persistence]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68d3c2bb44d1 + - project: name: persistence-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'persistence' @@ -51,13 +52,15 @@ email-upstream: '[persistence]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68d3c2bb44d1 + - project: name: persistence-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'persistence' @@ -78,6 +81,9 @@ email-upstream: '[persistence]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68d3c2bb44d1 + - project: name: persistence-sonar jobs: diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 4206016aa..7aada581a 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -73,7 +73,7 @@ docker_system_image: CentOS 7 - docker - 20171016-0023 odl_system_count: 1 odl_system_flavor: 4 GB General Purpose v1 - odl_system_image: CentOS 7 - java-builder - 20171020-0130 + odl_system_image: CentOS 7 - java-builder - 20171030-1039 openstack_system_count: 1 openstack_system_flavor: 8 GB General Purpose v1 openstack_system_image: CentOS 7 - devstack - 20171014-2147 diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index c9a2bb439..c57615dfc 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -2,10 +2,9 @@ - project: name: reservation-oxygen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: oxygen project: 'reservation' @@ -23,13 +22,15 @@ email-upstream: '[reservation]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68d9bc504037 + - project: name: reservation-nitrogen jobs: - - '{project-name}-clm-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: nitrogen project: 'reservation' @@ -47,13 +48,15 @@ email-upstream: '[reservation]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68d9bc504037 + - project: name: reservation-carbon jobs: - - '{project-name}-clm-{stream}' - '{project-name}-integration-{stream}' + - '{project-name}-maven-jobs' - '{project-name}-merge-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'reservation' @@ -72,6 +75,9 @@ email-upstream: '[reservation]' archive-artifacts: '' + # Used by the release job + staging-profile-id: a68d9bc504037 + - project: name: reservation-sonar jobs: