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 <robert.varga@pantheon.tech>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index dbec0e7a0301104562e9a32914b6d989526673f7..dfaeb80fc10ae0b06a594e04dac2bd2b7cb47079 100644 (file)
--- 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 a70d9931f370007d394a2c6be7843b8a9053276c..8761d4281da7d1b213aa75651aecf00adcbb148a 100644 (file)
--- 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 7a12b5ef1d51941152818d760e3b3ab2894d9ddd..f14d2961271f89c43599aca9ab7eb03443ceb565 100644 (file)
--- 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 9a9ec3cfaeaeb0fe0c1cc211016805fda797c1c5..34f9cb0479001d2535208c946b315dba2a7315fc 100644 (file)
--- 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 a0eb14665b958573ee1b02331cf7e8fb0f246d3a..41f213a7278cd477ed5268287f77a95d82dcb49c 100644 (file)
--- 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 b9a5ab90e477e754e5f36d4dee031d32f0937d45..654a375c5cd6d97723f87b9e88d82531765aebc2 100644 (file)
--- 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 c3e2ce7930ff7178b19526f8c152616160fc16be..90516e361d69f1133f602231d2d1cb2b6b9ee659 100644 (file)
--- 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 610077121b01776fc899443ab149426c1dc8a0bd..45858a5eab84e0eafad1eb1ada5c62abed43188e 100644 (file)
--- 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 710f7e7ce2a13e30690e218f0eed539c120e6674..2e3ec821c936a9188cdd6767649b5f998bdcb399 100644 (file)
--- 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 d866336beb77739ea0eacdbf950f83e4fa7b01ec..0b059bc870da4b4969f74cafd8299a0ea16fe0d4 100644 (file)
--- 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 2325fe5f14d3e25d05eddf229ba38c1d19b653f3..e4ea294dca9acaea606bca119f4aefe361b256dd 100644 (file)
--- 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 f21dc8685895e191f9a7594ef982a16baccdcee8..bc78e6840e3a27e79d5fa52c7b3b86866bc04348 100644 (file)
--- 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 306341d64e251907fc7da1a9eb023ac3e2bbd172..26ce3cea0ed501f6dba535c27f8376976f368579 100644 (file)
--- 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 e36be2b8825fd7fb716a84abddb23c59ffe39dd4..6795f2161860a9431aa2f30530504c8fbca9be20 100644 (file)
--- 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 eb805706bbd913f34ca360301d0f57d12f3b3c26..2f6fefffba4580db909d33bf57f42d45b3455862 100644 (file)
--- 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 1e064c5ed09f2b37250d056c25de24a504a29b55..215bec89f543883281ac1016a6aaf546e80e6159 100644 (file)
--- 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 675f8c09835e69740d53797e7a1cdd2e938cd77c..a01688903aa649f11cf8c3f01b068edceaa1b84c 100644 (file)
--- 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"