summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2023-02-01 08:13:17 -0500
committerDan Timoney <dtimoney@att.com>2023-02-01 08:13:17 -0500
commitc43d809caabb7b6aa84fd46ad29b63c666cb90ad (patch)
tree10e7524365373d0c14fd72038250a841f1d6120e /jjb
parent3e93fb32bbd89bda3ebf08af0a054c0b0129a531 (diff)
Resolve CCSDK, SDNC openjdk17 compile issues
Move ccsdk and sdnc jobs from centos7 to centos8 build nodes, which support openjdk17 Issue-ID: CCSDK-3813 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I69d6af31b8f874a3dc08a8365eb8ce9a360f1b68
Diffstat (limited to 'jjb')
-rw-r--r--jjb/ccsdk/apps.yaml6
-rw-r--r--jjb/ccsdk/ccsdk-oran.yaml10
-rw-r--r--jjb/ccsdk/cds.yaml6
-rw-r--r--jjb/ccsdk/distribution.yaml14
-rw-r--r--jjb/ccsdk/features.yaml12
-rw-r--r--jjb/ccsdk/odl-legacy.yaml12
-rw-r--r--jjb/ccsdk/parent.yaml8
-rw-r--r--jjb/ccsdk/sli.yaml12
-rw-r--r--jjb/sdnc/sdnc-apps.yaml6
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml6
-rw-r--r--jjb/sdnc/sdnc-oam.yaml6
11 files changed, 49 insertions, 49 deletions
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index b16836987..40d57d014 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -15,7 +15,7 @@
cron: '@daily'
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
@@ -28,7 +28,7 @@
maven-versions-plugin: true
cron: '@daily'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
project: 'ccsdk/apps'
stream:
@@ -48,7 +48,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 4332472e3..6b499393e 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -9,21 +9,21 @@
cron: '@daily'
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
mvn-opts: '-Ddocker.skip=true'
cron: ''
sbom-generator: false
- gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -Pdocker'
maven-versions-plugin: true
cron: '@daily'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
project: 'ccsdk/oran'
stream:
- 'master':
@@ -39,7 +39,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -79,7 +79,7 @@
pattern: 'a1-policy-management/.*'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
project: 'ccsdk/oran'
project-name: 'ccsdk-oran'
branch: 'master'
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index ae8e83393..a0447dbb6 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -31,7 +31,7 @@
branch: 'jakarta'
- 'kohn':
branch: 'kohn'
- java-version: openjdk17
+ java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-cds-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -97,7 +97,7 @@
project: 'ccsdk/cds'
project-name: 'ccsdk-cds'
branch: 'master'
- java-version: openjdk17
+ java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-cds-settings'
mvn-goals: 'clean install'
@@ -113,7 +113,7 @@
stream:
- 'master':
branch: 'master'
- java-version: openjdk17
+ java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-cds-settings'
build-node: centos8-builder-4c-4g
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index b48f01b0a..26eb0b6ee 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -9,21 +9,21 @@
cron: '@daily'
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
maven-versions-plugin: true
cron: ''
sbom-generator: false
- gerrit-maven-docker-stage:
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker'
maven-versions-plugin: true
cron: '@daily'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
project: 'ccsdk/distribution'
stream:
@@ -40,7 +40,7 @@
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -60,7 +60,7 @@
# archive-artifacts: ''
# docker-pom: 'pom.xml'
# mvn-profile: docker
-# build-node: centos7-docker-arm64-4c-2g
+# build-node: centos8-docker-arm64-4c-2g
#
- project:
name: ccsdk-distribution-clm
@@ -75,7 +75,7 @@
java-version: openjdk17
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-distribution-settings'
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
- project:
@@ -83,6 +83,6 @@
project-name: ccsdk-distribution
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: ccsdk/distribution
branch: master
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index b581395ac..4a2ba1df5 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -9,13 +9,13 @@
cron: '@daily'
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
sbom-generator: false
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
project: 'ccsdk/features'
stream:
@@ -36,7 +36,7 @@
files: '**'
archive-artifacts: ''
mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -49,7 +49,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
project: 'ccsdk/features'
project-name: 'ccsdk-features'
branch: 'master'
@@ -73,13 +73,13 @@
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-features-settings'
mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
- project:
name: ccsdk-features-info
project-name: ccsdk-features
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: ccsdk/features
branch: master
diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml
index e3546b150..21036bcf1 100644
--- a/jjb/ccsdk/odl-legacy.yaml
+++ b/jjb/ccsdk/odl-legacy.yaml
@@ -15,13 +15,13 @@
cron: '@daily'
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
sbom-generator: false
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
project: 'ccsdk/odl-legacy'
stream:
@@ -37,7 +37,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -50,7 +50,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
project: 'ccsdk/odl-legacy'
project-name: 'ccsdk-odl-legacy'
branch: 'master'
@@ -73,14 +73,14 @@
java-version: openjdk17
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-odl-legacy-settings'
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
- project:
name: ccsdk-odl-legacy-info
project: ccsdk/odl-legacy
project-name: ccsdk-odl-legacy
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
branch: master
jobs:
- gerrit-info-yaml-verify
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index e514e2e68..2a8cc5e68 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -9,13 +9,13 @@
cron: '@daily'
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
sbom-generator: false
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -60,13 +60,13 @@
java-version: openjdk17
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-parent-settings'
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
- project:
name: ccsdk-parent-info
project-name: ccsdk-parent
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: ccsdk/parent
branch: master
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 1da1fdaf5..51407c2d9 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -9,13 +9,13 @@
cron: '@daily'
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
sbom-generator: false
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
project: 'ccsdk/sli'
stream:
@@ -35,7 +35,7 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -48,7 +48,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
project: 'ccsdk/sli'
project-name: 'ccsdk-sli'
branch: 'master'
@@ -71,13 +71,13 @@
java-version: openjdk17
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-sli-settings'
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
- project:
name: ccsdk-sli-info
project-name: ccsdk-sli
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: ccsdk/sli
branch: master
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index b92ed487b..7b4083201 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -18,7 +18,7 @@
cron: '@daily'
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
@@ -31,7 +31,7 @@
maven-versions-plugin: true
cron: '@daily'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
project: 'sdnc/apps'
stream:
@@ -115,6 +115,6 @@
project-name: sdnc-apps
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdnc/apps
branch: master
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index a2f070fc4..d44904c08 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -8,11 +8,11 @@
cron: '@daily'
- gerrit-maven-stage:
sign-artifacts: true
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
cron: ''
sbom-generator: false
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
project: 'sdnc/northbound'
stream:
@@ -77,6 +77,6 @@
project-name: sdnc-northbound
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdnc/northbound
branch: master
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 9ffb8296c..da7a4cc4d 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -9,7 +9,7 @@
cron: '@daily'
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-stage:
- build-node: centos7-builder-4c-4g
+ build-node: centos8-builder-4c-4g
sign-artifacts: true
mvn-params: '-Dmaven.test.skip=true'
cron: ''
@@ -22,7 +22,7 @@
maven-versions-plugin: true
cron: '@daily'
- '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
+ build-node: centos8-docker-8c-8g
project: 'sdnc/oam'
stream:
- 'master':
@@ -79,6 +79,6 @@
project-name: sdnc-oam
jobs:
- gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
+ build-node: centos8-builder-2c-1g
project: sdnc/oam
branch: master