From: Robert Varga Date: Thu, 1 Jun 2023 13:42:49 +0000 (+0200) Subject: Feat: switch default build-node to centos8-4c-4g X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F106349%2F2;p=releng%2Fbuilder.git Feat: switch default build-node to centos8-4c-4g We are effectively not using centos7 nodes for most jobs, opting to overriding to default in most places. Switch the default, so we do not have to carry these overrides. Change-Id: I9112a6223ff434e5d8f46e425988002ab0f93f71 Signed-off-by: Robert Varga --- diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index dbec0e7a0..dfaeb80fc 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -16,7 +16,6 @@ branch: "master" java-version: "openjdk17" mvn-settings: "aaa-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[aaa] [odlparent] [yangtools] [controller]" @@ -40,7 +39,6 @@ branch: 0.17.x java-version: "openjdk17" mvn-settings: "aaa-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[aaa] [odlparent] [yangtools] [controller]" @@ -64,7 +62,6 @@ branch: 0.16.x java-version: "openjdk17" mvn-settings: "aaa-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[aaa] [odlparent] [yangtools] [controller]" @@ -102,7 +99,6 @@ java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "aaa-settings" - build-node: centos8-builder-4c-4g sonarcloud: true sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-api-token: "{sonarcloud_api_token}" diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index a70d9931f..8761d4281 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -14,7 +14,6 @@ project: "controller" project-name: "controller" branch: master - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "controller-settings" mvn-goals: "clean deploy -Pdocs" @@ -40,7 +39,6 @@ project: "controller" project-name: "controller" branch: 7.0.x - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "controller-settings" mvn-goals: "clean deploy -Pdocs" @@ -66,7 +64,6 @@ project: "controller" project-name: "controller" branch: 6.0.x - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "controller-settings" mvn-goals: "clean deploy -Pdocs" @@ -105,7 +102,6 @@ project: "controller" project-name: "controller" branch: master - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "controller-settings" diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 7a12b5ef1..f14d29612 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -17,7 +17,6 @@ branch: "master" java-version: "openjdk17" mvn-settings: "daexim-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[daexim] [odlparent] [yangtools] [controller]" @@ -42,7 +41,6 @@ branch: "stable/argon" java-version: "openjdk17" mvn-settings: "daexim-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[daexim] [odlparent] [yangtools] [controller]" @@ -67,7 +65,6 @@ branch: "stable/chlorine" java-version: "openjdk17" mvn-settings: "daexim-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}" email-upstream: "[daexim] [odlparent] [yangtools] [controller]" @@ -82,7 +79,6 @@ project: "daexim" project-name: "daexim" branch: "master" - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "daexim-settings" diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 9a9ec3cfa..34f9cb047 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -16,7 +16,7 @@ # Timeout in minutes build-timeout: 360 - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g schedule: "" schedule-daily: "H H * * *" schedule-saturday: "H H * * 6" diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index a0eb14665..41f213a72 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -17,7 +17,6 @@ branch: master java-version: "openjdk17" mvn-settings: "infrautils-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream}" email-upstream: "[infrautils] [odlparent]" @@ -42,7 +41,6 @@ branch: 5.0.x java-version: "openjdk17" mvn-settings: "infrautils-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream}" email-upstream: "[infrautils] [odlparent]" @@ -67,7 +65,6 @@ branch: "4.0.x" java-version: "openjdk17" mvn-settings: "infrautils-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream}" email-upstream: "[infrautils] [odlparent]" @@ -105,7 +102,6 @@ java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "infrautils-settings" - build-node: centos8-builder-4c-4g sonarcloud: true sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-api-token: "{sonarcloud_api_token}" diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index b9a5ab90e..654a375c5 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -14,7 +14,6 @@ project: integration/distribution project-name: distribution - build-node: centos8-builder-4c-4g mvn-settings: integration-distribution-settings mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt" mvn-opts: "-Xmx1024m" @@ -44,7 +43,6 @@ project: integration/distribution project-name: distribution - build-node: centos8-builder-4c-4g mvn-settings: integration-distribution-settings mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt" mvn-opts: "-Xmx1024m" @@ -94,7 +92,6 @@ project: integration/distribution project-name: distribution - build-node: centos8-builder-4c-4g branch: master java-version: "openjdk17" mvn-version: mvn38 diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index c3e2ce793..90516e361 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -17,7 +17,6 @@ java-version: "openjdk17" branch: "master" mvn-settings: "jsonrpc-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]" @@ -42,7 +41,6 @@ java-version: "openjdk17" branch: "stable/argon" mvn-settings: "jsonrpc-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]" @@ -67,7 +65,6 @@ java-version: "openjdk17" branch: "stable/chlorine" mvn-settings: "jsonrpc-settings" - build-node: centos8-builder-4c-4g dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}" email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]" @@ -94,7 +91,6 @@ project-name: "jsonrpc" java-version: "openjdk17" branch: "master" - build-node: centos8-builder-4c-4g mvn-version: mvn38 mvn-settings: "jsonrpc-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 610077121..45858a5ea 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -105,7 +105,6 @@ project: "lispflowmapping" project-name: "lispflowmapping" branch: "master" - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "lispflowmapping-settings" diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 710f7e7ce..2e3ec821c 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -15,7 +15,6 @@ branch: master stream: master - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "mdsal-settings" build-timeout: 60 @@ -47,7 +46,6 @@ branch: 11.0.x stream: 11.0.x - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "mdsal-settings" build-timeout: 60 @@ -79,7 +77,6 @@ branch: 10.0.x stream: 10.0.x - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "mdsal-settings" build-timeout: 60 @@ -123,7 +120,6 @@ project: "mdsal" project-name: "mdsal" branch: "master" - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "mdsal-settings" diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index d866336be..0b059bc87 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -17,7 +17,6 @@ project-name: "netconf" stream: master branch: "master" - build-node: centos8-builder-4c-4g java-version: "openjdk17" karaf-version: "netconf" mvn-settings: "netconf-settings" @@ -47,7 +46,6 @@ project-name: "netconf" stream: 5.0.x branch: "5.0.x" - build-node: centos8-builder-4c-4g java-version: "openjdk17" karaf-version: "netconf" mvn-settings: "netconf-settings" @@ -77,7 +75,6 @@ project-name: "netconf" stream: 4.0.x branch: "4.0.x" - build-node: centos8-builder-4c-4g java-version: "openjdk17" karaf-version: "netconf" mvn-settings: "netconf-settings" @@ -117,7 +114,6 @@ project: "netconf" project-name: "netconf" branch: "master" - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "netconf-settings" diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 2325fe5f1..e4ea294dc 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -18,7 +18,6 @@ branch: master mvn-settings: odlparent-settings - build-node: centos8-builder-4c-4g dependencies: "" email-upstream: "[odlparent]" @@ -52,7 +51,6 @@ branch: 12.0.x mvn-settings: odlparent-settings - build-node: centos8-builder-4c-4g dependencies: "" email-upstream: "[odlparent]" @@ -86,7 +84,6 @@ branch: 11.0.x mvn-settings: odlparent-settings - build-node: centos8-builder-4c-4g dependencies: "" email-upstream: "[odlparent]" @@ -127,7 +124,6 @@ project-name: "odlparent" branch: "master" - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "odlparent-settings" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index f21dc8685..bc78e6840 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -18,7 +18,6 @@ project: "openflowplugin" project-name: "openflowplugin" branch: "master" - build-node: centos8-builder-4c-4g build-timeout: 90 java-version: "openjdk17" mvn-settings: "openflowplugin-settings" @@ -51,7 +50,6 @@ project: "openflowplugin" project-name: "openflowplugin" branch: "stable/argon" - build-node: centos8-builder-4c-4g build-timeout: 90 java-version: "openjdk17" mvn-settings: "openflowplugin-settings" @@ -84,7 +82,6 @@ project: "openflowplugin" project-name: "openflowplugin" branch: "stable/chlorine" - build-node: centos8-builder-4c-4g build-timeout: 90 java-version: "openjdk17" mvn-settings: "openflowplugin-settings" @@ -106,7 +103,6 @@ project: "openflowplugin" project-name: "openflowplugin" branch: "master" - build-node: centos8-builder-4c-4g build-timeout: 90 java-version: "openjdk17" mvn-version: mvn38 diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 306341d64..26ce3cea0 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -17,7 +17,6 @@ project: "ovsdb" project-name: "ovsdb" branch: "master" - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "ovsdb-settings" dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}" @@ -44,7 +43,6 @@ project: "ovsdb" project-name: "ovsdb" branch: "stable/argon" - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "ovsdb-settings" dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}" @@ -71,7 +69,6 @@ project: "ovsdb" project-name: "ovsdb" branch: "stable/chlorine" - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "ovsdb-settings" dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}" @@ -88,7 +85,6 @@ project: "ovsdb" project-name: "ovsdb" branch: "master" - build-node: centos8-builder-4c-4g build-timeout: 90 java-version: "openjdk17" mvn-version: mvn38 diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index e36be2b88..6795f2161 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -11,7 +11,6 @@ - gerrit-jenkins-sandbox-cleanup - gerrit-jjb-deploy-job - gerrit-jjb-merge: - build-node: centos8-builder-4c-4g build-timeout: 90 - gerrit-jjb-verify: build-timeout: 90 diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index eb805706b..2f6fefffb 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -103,7 +103,6 @@ project: "serviceutils" project-name: "serviceutils" branch: "master" - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "serviceutils-settings" diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 1e064c5ed..215bec89f 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -101,7 +101,6 @@ project: "transportpce" project-name: "transportpce" branch: "master" - build-node: centos8-builder-4c-4g build-timeout: 90 java-version: "openjdk17" mvn-version: mvn38 diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 675f8c098..a01688903 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -10,7 +10,6 @@ branch: master stream: master - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "yangtools-settings" @@ -38,7 +37,6 @@ branch: 10.0.x stream: 10.0.x - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "yangtools-settings" @@ -66,7 +64,6 @@ branch: 9.0.x stream: 9.0.x - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-settings: "yangtools-settings" @@ -111,7 +108,6 @@ project: "yangtools" project-name: "yangtools" branch: "master" - build-node: centos8-builder-4c-4g java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "yangtools-settings"