From ed955cca682f4b9ea7eb72a6dc46c70ef6726406 Mon Sep 17 00:00:00 2001 From: Bengt Thuree Date: Fri, 16 Sep 2022 19:14:39 +1000 Subject: [PATCH] Chore: Move to centos8-builder jjb/aai/aai-aai-common.yaml jjb/aai/aai-babel.yaml jjb/aai/aai-graphadmin.yaml jjb/aai/aai-graphgraph.yaml jjb/aai/aai-logging-service.yaml jjb/aai/aai-model-loader.yaml jjb/aai/aai-resources.yaml jjb/aai/aai-rest-client.yaml jjb/aai/aai-schema-service.yaml jjb/aai/aai-sparky-be.yaml jjb/aai/aai-sparky-fe.yaml jjb/aai/aai-traversal.yaml jjb/ccsdk/apps.yaml jjb/ccsdk/ccsdk-oran.yaml jjb/ccsdk/cds.yaml Issue-ID: CIMAN-33 Signed-off-by: Bengt Thuree Change-Id: If82f0d001e990299643a7dfac099c326c3d3eac5 --- jjb/aai/aai-aai-common.yaml | 4 ++-- jjb/aai/aai-babel.yaml | 4 ++-- jjb/aai/aai-graphadmin.yaml | 4 ++-- jjb/aai/aai-graphgraph.yaml | 4 ++-- jjb/aai/aai-logging-service.yaml | 4 ++-- jjb/aai/aai-model-loader.yaml | 4 ++-- jjb/aai/aai-resources.yaml | 4 ++-- jjb/aai/aai-rest-client.yaml | 4 ++-- jjb/aai/aai-schema-service.yaml | 4 ++-- jjb/aai/aai-sparky-be.yaml | 4 ++-- jjb/aai/aai-sparky-fe.yaml | 4 ++-- jjb/aai/aai-traversal.yaml | 4 ++-- jjb/ccsdk/apps.yaml | 4 ++-- jjb/ccsdk/ccsdk-oran.yaml | 6 +++--- jjb/ccsdk/cds.yaml | 10 +++++----- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 68c84c901..ed523fab3 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': @@ -77,7 +77,7 @@ project-name: aai-aai-common jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/aai-common branch: master diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 65a1731ae..5fad24f50 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -14,7 +14,7 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -82,6 +82,6 @@ project-name: aai-babel jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/babel branch: master diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index aa56425f1..91c5755f4 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -77,6 +77,6 @@ project-name: aai-graphadmin jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/graphadmin branch: master diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 45c454db8..555aadb93 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -68,6 +68,6 @@ project-name: aai-graphgraph jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/graphgraph branch: master diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 000e4098a..2e8640827 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': @@ -65,6 +65,6 @@ project-name: aai-logging-service jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/logging-service branch: master diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index fd656798c..e52ab2106 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -14,7 +14,7 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -80,7 +80,7 @@ project-name: aai-model-loader jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/model-loader branch: master diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 878717385..2632d2c27 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -16,7 +16,7 @@ - gerrit-maven-stage: mvn-params: '-DskipTests' sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -81,7 +81,7 @@ project-name: aai-resources jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/resources branch: master java-version: openjdk8 diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 8b80d6cd2..464044426 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': @@ -65,6 +65,6 @@ project-name: aai-rest-client jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/rest-client branch: master diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 23db9c4c2..9430a2446 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -77,6 +77,6 @@ project-name: aai-schema-service jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/schema-service branch: master diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index a89af363a..690ebf16b 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -14,7 +14,7 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -79,7 +79,7 @@ project-name: aai-sparky-be jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/sparky-be branch: master diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index aa3aa8d7e..0f0bd8dfc 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -2,7 +2,7 @@ - project: name: sparky-fe project-name: 'aai-sparky-fe' - build-node: 'centos7-builder-4c-4g' + build-node: 'centos8-builder-4c-4g' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -27,7 +27,7 @@ project-name: aai-sparky-fe jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/sparky-fe branch: master diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index dce710e70..e1e00856c 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -16,7 +16,7 @@ - gerrit-maven-stage: mvn-params: '-DskipTests' sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: @@ -80,6 +80,6 @@ project-name: aai-traversal jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: aai/traversal branch: master diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 29b5e1251..5e3776f19 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: '' @@ -113,7 +113,7 @@ project-name: ccsdk-apps jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: ccsdk/apps branch: master diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 6b2b9822c..1627a3e7d 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.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' mvn-opts: '-Ddocker.skip=true' @@ -61,13 +61,13 @@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-opts: '-Ddocker.skip=true' - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g - project: name: ccsdk-oran-info project: ccsdk/oran project-name: ccsdk-oran - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 426eea6db..3b79f235e 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.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: '' @@ -55,7 +55,7 @@ cron: '@daily' mvn-params: '-Ddocker.skip.push=true -P docker' - 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: '' @@ -94,7 +94,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/cds' project-name: 'ccsdk-cds' branch: 'master' @@ -121,14 +121,14 @@ java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g - project: name: ccsdk-cds-info project-name: ccsdk-cds jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: ccsdk/cds branch: master -- 2.16.6