From: Thanh Ha Date: Thu, 6 Aug 2020 14:12:45 +0000 (-0400) Subject: Split out release-merge job to separate project X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=5102e39ad035be2409ce11d59605921a58646308;p=releng%2Fbuilder.git Split out release-merge job to separate project Split all of the release-merge jobs into a separate project definition. This resolves issue where the branch cutting script is grabbing this definition and copying it to the next release every time we do branch cutting causing duplicate job definitions. Considering there can be only a single release-merge job per-project it makes sense that it has it's own separate project definition that is separate from jobs that can have multiple streams and branches. Also configure all the jobs to use a 2c-1g system (smallest available system) considering that it's essentially a curl script that hits a Nexus Rest API. Change-Id: Id701e77ed9f1ba61f6d53e4d49869d0cf118306a Signed-off-by: Thanh Ha --- diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml index a6b3c5a39..2e58f2bc8 100644 --- a/jjb/alt-datastores/alt-datastores.yaml +++ b/jjb/alt-datastores/alt-datastores.yaml @@ -7,7 +7,6 @@ project-pattern: alt-datastores rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-alt-datastore/86481/ rtd-token: dc412b0cc43fba4098173878f970e76380ce0084 - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -96,6 +95,17 @@ # Used by the release job staging-profile-id: daa2b00117ed6 +- project: + name: alt-datastores-release-management + jobs: + - gerrit-release-merge + + project: alt-datastores + project-name: alt-datastores + + build-node: centos7-builder-2c-1g + mvn-settings: alt-datastores-settings + - project: name: alt-datastores-sonar jobs: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index cfe9b4e34..dcc3761b1 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -2,7 +2,6 @@ - project: name: bier-silicon jobs: - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -84,6 +83,17 @@ # Used by the release job staging-profile-id: 942a8075b1f2a +- project: + name: bier-release-management + jobs: + - gerrit-release-merge + + project: bier + project-name: bier + + build-node: centos7-builder-2c-1g + mvn-settings: bier-settings + - project: name: bier-sonar jobs: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index b03b92c9d..48734b30d 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -2,8 +2,6 @@ - project: name: controller-master jobs: - - 'gerrit-release-merge': - build-node: centos7-builder-2c-2g - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g project-pattern: controller @@ -83,6 +81,17 @@ # Used by the release job staging-profile-id: 96c1c9177efdd +- project: + name: controller-release-management + jobs: + - gerrit-release-merge + + project: controller + project-name: controller + + build-node: centos7-builder-2c-1g + mvn-settings: controller-settings + - project: name: controller-sonar jobs: diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml index 3ccc98e05..60c7a46c3 100644 --- a/jjb/detnet/detnet.yaml +++ b/jjb/detnet/detnet.yaml @@ -7,7 +7,6 @@ project-pattern: detnet rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-detnet/86479/ rtd-token: 5195d77d11453a03e4b4ad3688b7026ab02cfcce - - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs @@ -75,6 +74,17 @@ # Used by the release job staging-profile-id: 8981976d0fea7 +- project: + name: detnet-release-management + jobs: + - gerrit-release-merge + + project: detnet + project-name: detnet + + build-node: centos7-builder-2c-1g + mvn-settings: detnet-settings + - project: name: detnet-sonar jobs: diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index c05f46807..25289309c 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -2,7 +2,6 @@ - project: name: dlux-magnesium jobs: - - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs @@ -35,6 +34,17 @@ # Used by the release job staging-profile-id: 96e6a0327484f +- project: + name: dlux-release-management + jobs: + - gerrit-release-merge + + project: dlux + project-name: dlux + + build-node: centos7-builder-2c-1g + mvn-settings: dlux-settings + - project: name: dlux-sonar jobs: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index d95665652..1580b9af5 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -2,7 +2,6 @@ - project: name: dluxapps-silicon jobs: - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -80,6 +79,17 @@ # Used by the release job staging-profile-id: 96e6fb1e65bf9 +- project: + name: dluxapps-release-management + jobs: + - gerrit-release-merge + + project: dluxapps + project-name: dluxapps + + build-node: centos7-builder-2c-1g + mvn-settings: dluxapps-settings + - project: name: dluxapps-sonar jobs: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 4dbf8ada1..a336384ce 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -2,7 +2,6 @@ - project: name: groupbasedpolicy-silicon jobs: - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -108,6 +107,17 @@ # Used by the release job staging-profile-id: 96fbb93f95a76 +- project: + name: groupbasedpolicy-release-management + jobs: + - gerrit-release-merge + + project: groupbasedpolicy + project-name: groupbasedpolicy + + build-node: centos7-builder-2c-1g + mvn-settings: groupbasedpolicy-settings + - project: name: groupbasedpolicy-sonar jobs: diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 2db27664e..a163fa3c4 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -2,7 +2,6 @@ - project: name: vbd-master jobs: - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -17,6 +16,17 @@ # Used by the release job staging-profile-id: 96fc362c36862 +- project: + name: vbd-release-management + jobs: + - gerrit-release-merge + + project: honeycomb/vbd + project-name: vbd + + build-node: centos7-builder-2c-1g + mvn-settings: honeycomb-vbd-settings + - project: name: vbd-sonar jobs: diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 4ebffb447..d156c1eaa 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -2,8 +2,6 @@ - project: name: infrautils-master jobs: - - 'gerrit-release-merge': - build-node: centos7-builder-2c-2g - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g doc-dir: .tox/docs/tmp/html @@ -79,6 +77,17 @@ # Used by the release job staging-profile-id: 96fca0367756c +- project: + name: infrautils-release-management + jobs: + - gerrit-release-merge + + project: infrautils + project-name: infrautils + + build-node: centos7-builder-2c-1g + mvn-settings: infrautils-settings + - project: name: infrautils-sonar jobs: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 6ad41ede1..a070bf727 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -8,7 +8,6 @@ project-pattern: jsonrpc rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/ rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d - - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs @@ -98,6 +97,17 @@ # Used by the release job staging-profile-id: 96fdf4408765d +- project: + name: jsonrpc-release-management + jobs: + - gerrit-release-merge + + project: jsonrpc + project-name: jsonrpc + + build-node: centos7-builder-2c-1g + mvn-settings: jsonrpc-settings + - project: name: jsonrpc-sonar jobs: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index c2d851548..864ac48dd 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -2,7 +2,6 @@ - project: name: l2switch-silicon jobs: - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -96,6 +95,17 @@ # Used by the release job staging-profile-id: 96fee85953ca0 +- project: + name: l2switch-release-management + jobs: + - gerrit-release-merge + + project: l2switch + project-name: l2switch + + build-node: centos7-builder-2c-1g + mvn-settings: l2switch-settings + - project: name: l2switch-sonar jobs: diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 244360c83..08e384877 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -2,8 +2,6 @@ - project: name: mdsal-master jobs: - - 'gerrit-release-merge': - build-node: centos7-builder-2c-2g - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g project-pattern: mdsal @@ -132,6 +130,17 @@ # Used by the release job staging-profile-id: a674173c7b29d +- project: + name: mdsal-release-management + jobs: + - gerrit-release-merge + + project: mdsal + project-name: mdsal + + build-node: centos7-builder-2c-1g + mvn-settings: mdsal-settings + - project: name: mdsal-sonar jobs: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index fe2d96d3d..5ae1ff95c 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -4,7 +4,6 @@ jobs: - odl-maven-jobs - odl-maven-verify-jobs - - gerrit-release-merge stream: silicon project: 'nemo' @@ -76,6 +75,17 @@ # Used by the release job staging-profile-id: a67a9890f6202 +- project: + name: nemo-release-management + jobs: + - gerrit-release-merge + + project: nemo + project-name: nemo + + build-node: centos7-builder-2c-1g + mvn-settings: nemo-settings + - project: name: nemo-sonar jobs: diff --git a/jjb/odlguice/odlguice.yaml b/jjb/odlguice/odlguice.yaml index ff4dd7ea7..7fe2ab15d 100644 --- a/jjb/odlguice/odlguice.yaml +++ b/jjb/odlguice/odlguice.yaml @@ -2,7 +2,6 @@ - project: name: odlguice-silicon jobs: - - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs @@ -40,6 +39,17 @@ # Used by the release job staging-profile-id: 44ce7d1aad49e +- project: + name: odlguice-release-management + jobs: + - gerrit-release-merge + + project: odlguice + project-name: odlguice + + build-node: centos7-builder-2c-1g + mvn-settings: odlguice-settings + - project: name: odlguice-sonar jobs: diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml index 61748a8a3..10eb477e7 100644 --- a/jjb/odlmicro/odlmicro.yaml +++ b/jjb/odlmicro/odlmicro.yaml @@ -2,7 +2,6 @@ - project: name: odlmicro-silicon jobs: - - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs @@ -38,6 +37,17 @@ # Used by the release job staging-profile-id: 44ce67428fd0d +- project: + name: odlmicro-release-management + jobs: + - gerrit-release-merge + + project: odlmicro + project-name: odlmicro + + build-node: centos7-builder-2c-1g + mvn-settings: odlmicro-settings + - project: name: odlmicro-sonar jobs: @@ -56,7 +66,6 @@ sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - - project: name: odlmicro-info jobs: diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index b2ecd102e..fa9499fd4 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -2,8 +2,6 @@ - project: name: odlparent-master jobs: - - 'gerrit-release-merge': - build-node: centos7-builder-2c-2g - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g doc-dir: .tox/docs/tmp/html @@ -102,6 +100,17 @@ # Used by the release job staging-profile-id: 880d5ac25eaa +- project: + name: odlparent-release-management + jobs: + - gerrit-release-merge + + project: odlparent + project-name: odlparent + + build-node: centos7-builder-2c-1g + mvn-settings: odlparent-settings + - project: name: odlparent-sonar jobs: diff --git a/jjb/odlsaf/odlsaf.yaml b/jjb/odlsaf/odlsaf.yaml index 4ede6161d..25abe00ba 100644 --- a/jjb/odlsaf/odlsaf.yaml +++ b/jjb/odlsaf/odlsaf.yaml @@ -2,7 +2,6 @@ - project: name: odlsaf-silicon jobs: - - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs @@ -40,6 +39,17 @@ # Used by the release job staging-profile-id: 2802f0e38ee665 +- project: + name: odlsaf-release-management + jobs: + - gerrit-release-merge + + project: odlsaf + project-name: odlsaf + + build-node: centos7-builder-2c-1g + mvn-settings: odlsaf-settings + - project: name: odlsaf-sonar jobs: diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml index f154dbd38..99b4bd259 100644 --- a/jjb/odltools/odltools.yaml +++ b/jjb/odltools/odltools.yaml @@ -2,7 +2,6 @@ - project: name: odltools jobs: - - gerrit-release-merge - gerrit-tox-verify - '{project-name}-rtd-jobs': build-node: centos7-builder-2c-2g @@ -27,6 +26,17 @@ build-timeout: 60 mvn-settings: 'odltools-settings' +- project: + name: odltools-release-management + jobs: + - gerrit-release-merge + + project: odltools + project-name: odltools + + build-node: centos7-builder-2c-1g + mvn-settings: odltools-settings + - project: name: odltools-sonar jobs: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index de61c43c9..14ff10174 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -2,7 +2,6 @@ - project: name: of-config-silicon jobs: - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -76,6 +75,17 @@ # Used by the release job staging-profile-id: a6880455efe67 +- project: + name: of-config-release-management + jobs: + - gerrit-release-merge + + project: of-config + project-name: of-config + + build-node: centos7-builder-2c-1g + mvn-settings: of-config-settings + - project: name: of-config-sonar jobs: diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 829a7caf0..3c3f50a80 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -3,7 +3,6 @@ name: p4plugin-silicon jobs: - '{project-name}-maven-javadoc-jobs' - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -76,6 +75,17 @@ # Used by the release job staging-profile-id: a68bf26e208d4 +- project: + name: p4plugin-release-management + jobs: + - gerrit-release-merge + + project: p4plugin + project-name: p4plugin + + build-node: centos7-builder-2c-1g + mvn-settings: p4plugin-settings + - project: name: p4plugin-sonar jobs: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 1425f73b3..5f1465b9d 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -2,7 +2,6 @@ - project: name: packetcable-silicon jobs: - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -76,6 +75,17 @@ # Used by the release job staging-profile-id: a68ca4a24655c +- project: + name: packetcable-release-management + jobs: + - gerrit-release-merge + + project: packetcable + project-name: packetcable + + build-node: centos7-builder-2c-1g + mvn-settings: packetcable-settings + - project: name: packetcable-sonar jobs: diff --git a/jjb/plastic/plastic.yaml b/jjb/plastic/plastic.yaml index 2af8eb723..597e4d5c4 100644 --- a/jjb/plastic/plastic.yaml +++ b/jjb/plastic/plastic.yaml @@ -9,7 +9,6 @@ rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-plastic/102307/ rtd-token: 963a1745b909ae6a1eae01f814c4983d17fdd44c - gerrit-tox-verify - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -24,6 +23,17 @@ # Used by the release job staging-profile-id: 380d129f253e1 +- project: + name: plastic-release-management + jobs: + - gerrit-release-merge + + project: plastic + project-name: plastic + + build-node: centos7-builder-2c-1g + mvn-settings: plastic-settings + - project: name: plastic-sonar jobs: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 9061d10fe..bcd040515 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -2,7 +2,6 @@ - project: name: snmp-silicon jobs: - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -72,6 +71,17 @@ # Used by the release job staging-profile-id: a68fb236b93a6 +- project: + name: snmp-release-management + jobs: + - gerrit-release-merge + + project: snmp + project-name: snmp + + build-node: centos7-builder-2c-1g + mvn-settings: snmp-settings + - project: name: snmp-sonar jobs: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index fdfb44a89..3b0a1f0fa 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -9,7 +9,6 @@ rtd-token: 55ee5e520f96e1fa691b277b2919e8d62cb0b71f - odl-maven-jobs - odl-maven-verify-jobs - - gerrit-release-merge stream: silicon project: 'snmp4sdn' @@ -92,6 +91,17 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 +- project: + name: snmp4sdn-release-management + jobs: + - gerrit-release-merge + + project: snmp4sdn + project-name: snmp4sdn + + build-node: centos7-builder-2c-1g + mvn-settings: snmp4sdn-settings + - project: name: snmp4sdn-sonar jobs: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 6551f89ab..522964425 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -9,7 +9,6 @@ rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d - odl-maven-jobs - odl-maven-verify-jobs - - gerrit-release-merge java-version: 'openjdk11' @@ -109,6 +108,17 @@ # Used by the release job staging-profile-id: a6909c75719b7 +- project: + name: sxp-release-management + jobs: + - gerrit-release-merge + + project: sxp + project-name: sxp + + build-node: centos7-builder-2c-1g + mvn-settings: sxp-settings + - project: name: sxp-sonar jobs: diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index 5405f9b86..97853860c 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -10,7 +10,6 @@ project-pattern: telemetry rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/ rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb - - gerrit-release-merge stream: silicon project: 'telemetry' @@ -100,6 +99,17 @@ # Used by the release job staging-profile-id: 8ed9c52266504 +- project: + name: telemetry-release-management + jobs: + - gerrit-release-merge + + project: telemetry + project-name: telemetry + + build-node: centos7-builder-2c-1g + mvn-settings: telemetry-settings + - project: name: telemetry-sonar jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index c9bbf54bc..047e56185 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -10,7 +10,6 @@ - gerrit-tox-verify: build-timeout: 120 build-node: centos7-builder-4c-16g - - gerrit-release-merge - odl-maven-jobs-jdk11 - odl-maven-verify-jobs @@ -107,6 +106,17 @@ # Used by the release job staging-profile-id: a6927323fa3d4 +- project: + name: transportpce-release-management + jobs: + - gerrit-release-merge + + project: transportpce + project-name: transportpce + + build-node: centos7-builder-2c-1g + mvn-settings: transportpce-settings + - project: name: transportpce-sonar jobs: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 82391f919..a2312ba86 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -7,7 +7,6 @@ project-pattern: tsdr rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/ rtd-token: 96c97641155132afcc5900bafc68af3364d91c99 - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -92,6 +91,17 @@ # Used by the release job staging-profile-id: a69373036303c +- project: + name: tsdr-release-management + jobs: + - gerrit-release-merge + + project: tsdr + project-name: tsdr + + build-node: centos7-builder-2c-1g + mvn-settings: tsdr-settings + - project: name: tsdr-sonar jobs: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 2fccbd4cf..9133b8cfc 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -7,7 +7,6 @@ project-pattern: unimgr rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/ rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31 - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -107,6 +106,17 @@ # Used by the release job staging-profile-id: a695d0a0b8d51 +- project: + name: unimgr-release-management + jobs: + - gerrit-release-merge + + project: unimgr + project-name: unimgr + + build-node: centos7-builder-2c-1g + mvn-settings: unimgr-settings + - project: name: unimgr-sonar jobs: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 7a344f3a0..524d4136b 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -3,7 +3,6 @@ name: usc-silicon jobs: - '{project-name}-maven-javadoc-jobs' - - gerrit-release-merge - odl-maven-jobs - odl-maven-verify-jobs @@ -76,6 +75,17 @@ # Used by the release job staging-profile-id: a697b633b3ffe +- project: + name: usc-release-management + jobs: + - gerrit-release-merge + + project: usc + project-name: usc + + build-node: centos7-builder-2c-1g + mvn-settings: usc-settings + - project: name: usc-sonar jobs: diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index d02900bba..65e7a760f 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -2,8 +2,6 @@ - project: name: yangtools-master jobs: - - 'gerrit-release-merge': - build-node: centos7-builder-2c-2g - odl-maven-jobs-jdk11 - odl-maven-verify-jobs @@ -83,6 +81,17 @@ # Used by the release job staging-profile-id: 1271cf710cc09d +- project: + name: yangtools-release-management + jobs: + - gerrit-release-merge + + project: yangtools + project-name: yangtools + + build-node: centos7-builder-2c-1g + mvn-settings: yangtools-settings + - project: name: yangtools-sonar jobs: