[POLICY] Update maven-stage jobs to use ubuntu-22 node

- maven-stage jobs: ubuntu22
- release jobs: centos7

Issue-ID: POLICY-5529
Change-Id: Ibba59d4a5213bc1b89674636c70a1bf0dafe8963
Signed-off-by: waynedunican <wayne.dunican@est.tech>

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 473a131..a589bb7 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -64,12 +64,10 @@
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
-          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: "-P docker -Dmaven.test.skip=true"
           container-public-registry: "nexus3.onap.org:10001"

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index ad6a6a9..cfb09d7 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -58,12 +58,10 @@
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
-          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: "-P docker -Dmaven.test.skip=true"
           container-public-registry: "nexus3.onap.org:10001"

diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index ccfcc6a..46343fb 100644 (file)
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -57,13 +57,11 @@
           mvn-params: "-P docker"
       - gerrit-maven-stage:
           sbom-generator: true
-          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           maven-versions-plugin: true
           mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: "-P docker -Dmaven.test.skip=true"
           container-public-registry: "nexus3.onap.org:10001"

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 4586f4d..cf809ef 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -36,8 +36,8 @@
       - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sbom-generator: true
+          build-node: ubuntu2204-docker-8c-8g
           sign-artifacts: true
-          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
           mvn-params: "-Dmaven.test.skip=true"
       - "{project-name}-gerrit-release-jobs":

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 7d5853b..af276fe 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -55,16 +55,13 @@
           docker-pom: "pom.xml"
           mvn-profile: "docker"
           mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
-          build-node: centos8-docker-4c-4g
           sign-artifacts: true
           maven-versions-plugin: true
           mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: "-P docker -Dmaven.test.skip=true"
           container-public-registry: "nexus3.onap.org:10001"

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 8e88035..1349bf9 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -59,11 +59,9 @@
           sbom-generator: true
           sign-artifacts: true
           maven-versions-plugin: true
-          build-node: centos8-docker-4c-4g
           mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: "-P docker -Dmaven.test.skip=true"
           container-public-registry: "nexus3.onap.org:10001"

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 8b4062d..4d25b40 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -57,13 +57,11 @@
           mvn-params: "-P docker"
       - gerrit-maven-stage:
           sbom-generator: true
-          build-node: centos8-docker-4c-4g
           sign-artifacts: true
           maven-versions-plugin: true
           mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: "-P docker -Dmaven.test.skip=true"
           container-public-registry: "nexus3.onap.org:10001"

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index a0dcb84..0887615 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -55,7 +55,6 @@
           docker-pom: "pom.xml"
           mvn-profile: "docker"
           mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
@@ -64,7 +63,6 @@
           build-node: centos8-docker-4c-4g
       - gerrit-maven-docker-stage:
           sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: "-P docker -Dmaven.test.skip=true"
           container-public-registry: "nexus3.onap.org:10001"

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index fdca74a..08ae52b 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -55,16 +55,13 @@
           docker-pom: "pom.xml"
           mvn-profile: "docker"
           mvn-params: "-P docker"
-          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
-          build-node: centos8-docker-4c-4g
           sign-artifacts: true
           maven-versions-plugin: true
           mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: "-P docker -Dmaven.test.skip=true"
           container-public-registry: "nexus3.onap.org:10001"