From d2fd47f069f072e7c73d3b3ab05e0578bbc561fd Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Wed, 3 May 2023 09:29:46 -0700 Subject: [PATCH] Refactor: Cleanup for pre-commit Change-Id: I32ef9392e96257d4c390a637958855c98e340e3e Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg --- jjb/aai/aai-aai-common.yaml | 128 +++++++++++++++++++-------------------- jjb/aai/aai-babel.yaml | 78 ++++++++++++------------ jjb/aai/aai-graphadmin.yaml | 72 +++++++++++----------- jjb/aai/aai-graphgraph.yaml | 58 +++++++++--------- jjb/aai/aai-logging-service.yaml | 60 +++++++++--------- jjb/aai/aai-model-loader.yaml | 74 +++++++++++----------- jjb/aai/aai-resources.yaml | 74 +++++++++++----------- jjb/aai/aai-rest-client.yaml | 60 +++++++++--------- jjb/aai/aai-schema-service.yaml | 72 +++++++++++----------- jjb/aai/aai-sparky-be.yaml | 74 +++++++++++----------- jjb/aai/aai-sparky-fe.yaml | 52 ++++++++-------- jjb/aai/aai-traversal.yaml | 74 +++++++++++----------- 12 files changed, 438 insertions(+), 438 deletions(-) diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 432b4c0bf..a068a44c8 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -7,32 +7,32 @@ - project: name: aai-aai-common-master - project-name: 'aai-aai-common' + project-name: "aai-aai-common" jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" - gerrit-maven-stage: sbom-generator: true sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/aai-common' + project: "aai/aai-common" stream: - - 'master': - branch: 'master' - mvn-params: '-P spring-boot-2-1' - - 'jakarta': - branch: 'jakarta' - mvn-params: '-P spring-boot-2-1' - - 'kohn': - branch: 'kohn' - mvn-params: '-P spring-boot-2-1' - mvn-settings: 'aai-aai-common-settings' - mvn-version: 'mvn35' - files: '**' - archive-artifacts: '' + - "master": + branch: "master" + mvn-params: "-P spring-boot-2-1" + - "jakarta": + branch: "jakarta" + mvn-params: "-P spring-boot-2-1" + - "kohn": + branch: "kohn" + mvn-params: "-P spring-boot-2-1" + mvn-settings: "aai-aai-common-settings" + mvn-version: "mvn35" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g java-version: openjdk8 @@ -41,35 +41,35 @@ jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-builder-4c-4g - project: 'aai/aai-common' - project-name: 'aai-aai-common' - branch: 'master' - mvn-params: '-P spring-boot-2-1' - mvn-settings: 'aai-aai-common-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: 'mvn35' + project: "aai/aai-common" + project-name: "aai-aai-common" + branch: "master" + mvn-params: "-P spring-boot-2-1" + mvn-settings: "aai-aai-common-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + mvn-version: "mvn35" java-version: openjdk8 - project: name: aai-aai-common-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' + nexus-iq-namespace: "onap-" build-node: ubuntu1804-builder-4c-4g - project: 'aai/aai-common' - project-name: 'aai-aai-common' + project: "aai/aai-common" + project-name: "aai-aai-common" stream: - - 'master': - branch: 'master' - mvn-params: '-P spring-boot-2-1' - mvn-settings: 'aai-aai-common-settings' - mvn-version: 'mvn35' + - "master": + branch: "master" + mvn-params: "-P spring-boot-2-1" + mvn-settings: "aai-aai-common-settings" + mvn-version: "mvn35" java-version: openjdk8 - project: @@ -82,36 +82,36 @@ branch: master - project: - name: 'aai-aai-common-docker' + name: "aai-aai-common-docker" jobs: - - '{project-name}-{stream}-verify-docker' - - '{project-name}-{stream}-merge-docker' + - "{project-name}-{stream}-verify-docker" + - "{project-name}-{stream}-merge-docker" - gerrit-maven-docker-stage: sbom-generator: true - mvn-params: '-P docker -Dmaven.test.skip=true' + mvn-params: "-P docker -Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - project-name: 'aai-aai-common' - project: 'aai/aai-common' + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + project-name: "aai-aai-common" + project: "aai/aai-common" stream: - - 'master': - branch: 'master' - distro: 'alpine' - mvn-params: '-P spring-boot-2-1,docker' - - 'jakarta': - branch: 'jakarta' - distro: 'alpine' - mvn-params: '-P spring-boot-2-1,docker' - - 'kohn': - branch: 'kohn' - distro: 'alpine' - mvn-params: '-P spring-boot-2-1,docker' - docker_name: 'onap/aai-common-{distro}' - docker_build_args: '-f ./Dockerfile.{distro}' - docker_root: '$WORKSPACE/Dockerfiles/aai-common/' - mvn-settings: 'aai-aai-common-settings' - mvn-version: 'mvn35' - files: 'Dockerfiles/aai-common/**' + - "master": + branch: "master" + distro: "alpine" + mvn-params: "-P spring-boot-2-1,docker" + - "jakarta": + branch: "jakarta" + distro: "alpine" + mvn-params: "-P spring-boot-2-1,docker" + - "kohn": + branch: "kohn" + distro: "alpine" + mvn-params: "-P spring-boot-2-1,docker" + docker_name: "onap/aai-common-{distro}" + docker_build_args: "-f ./Dockerfile.{distro}" + docker_root: "$WORKSPACE/Dockerfiles/aai-common/" + mvn-settings: "aai-aai-common-settings" + mvn-version: "mvn35" + files: "Dockerfiles/aai-common/**" build-node: ubuntu1804-docker-8c-8g java-version: openjdk8 diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index cb57b6817..b3b187671 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -7,11 +7,11 @@ - project: name: aai-babel - project-name: 'aai-babel' + project-name: "aai-babel" jobs: - gerrit-maven-verify - gerrit-maven-merge: - cron: '@daily' + cron: "@daily" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g @@ -19,63 +19,63 @@ sbom-generator: true - gerrit-maven-docker-stage: sbom-generator: true - mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + # yamllint disable-line rule:line-length + mvn-params: "-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn" build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/babel' + project: "aai/babel" stream: - - 'jakarta': - branch: 'jakarta' - - 'kohn': - branch: 'kohn' - - 'master': - branch: 'master' - mvn-settings: 'aai-babel-settings' - files: '**' - archive-artifacts: '' + - "jakarta": + branch: "jakarta" + - "kohn": + branch: "kohn" + - "master": + branch: "master" + mvn-settings: "aai-babel-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g java-version: openjdk11 - mvn-version: 'mvn36' - nexus-snapshot-repo: 'snapshots' - mvn-snapshot-id: 'ecomp-snapshots' + mvn-version: "mvn36" + nexus-snapshot-repo: "snapshots" + mvn-snapshot-id: "ecomp-snapshots" - project: name: aai-babel-sonar jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-builder-4c-4g - project: 'aai/babel' - project-name: 'aai-babel' - branch: 'master' - mvn-settings: 'aai-babel-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "aai/babel" + project-name: "aai-babel" + branch: "master" + mvn-settings: "aai-babel-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: "mvn36" - project: name: aai-babel-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/babel' - project-name: 'aai-babel' + nexus-iq-namespace: "onap-" + project: "aai/babel" + project-name: "aai-babel" stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-babel-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + - "master": + branch: "master" + mvn-settings: "aai-babel-settings" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" java-version: openjdk11 - mvn-version: 'mvn36' - + mvn-version: "mvn36" - project: name: aai-babel-info diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 442ba233b..14db9ca98 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -7,10 +7,10 @@ - project: name: aai-graphadmin-master - project-name: 'aai-graphadmin' + project-name: "aai-graphadmin" jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g @@ -18,24 +18,24 @@ sbom-generator: true - gerrit-maven-docker-stage: sbom-generator: true - mvn-params: '-P docker -Dmaven.test.skip=true' + mvn-params: "-P docker -Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/graphadmin' + project: "aai/graphadmin" stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' - - 'jakarta': - branch: 'jakarta' - mvn-settings: 'aai-graphadmin-settings' - mvn-version: 'mvn35' - files: '**' - archive-artifacts: '' + - "master": + branch: "master" + - "kohn": + branch: "kohn" + - "jakarta": + branch: "jakarta" + mvn-settings: "aai-graphadmin-settings" + mvn-version: "mvn35" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g java-version: openjdk8 @@ -44,32 +44,32 @@ jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-builder-4c-4g - project: 'aai/graphadmin' - project-name: 'aai-graphadmin' - branch: 'master' - mvn-settings: 'aai-graphadmin-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: 'mvn35' + project: "aai/graphadmin" + project-name: "aai-graphadmin" + branch: "master" + mvn-settings: "aai-graphadmin-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + mvn-version: "mvn35" java-version: openjdk8 - project: name: aai-graphadmin-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/graphadmin' - project-name: 'aai-graphadmin' + nexus-iq-namespace: "onap-" + project: "aai/graphadmin" + project-name: "aai-graphadmin" stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-graphadmin-settings' - mvn-version: 'mvn35' + - "master": + branch: "master" + mvn-settings: "aai-graphadmin-settings" + mvn-version: "mvn35" java-version: openjdk8 - project: diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index eb9e75fa4..dc4477e9c 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -7,10 +7,10 @@ - project: name: aai-graphgraph-master - project-name: 'aai-graphgraph' + project-name: "aai-graphgraph" jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g @@ -18,48 +18,48 @@ sbom-generator: true - gerrit-maven-docker-stage: sbom-generator: true - mvn-params: '-P docker -Dmaven.test.skip=true' + mvn-params: "-P docker -Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/graphgraph' + project: "aai/graphgraph" stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-graphgraph-settings' - files: '**' - archive-artifacts: '' + - "master": + branch: "master" + mvn-settings: "aai-graphgraph-settings" + files: "**" + archive-artifacts: "" - project: name: aai-graphgraph-sonar jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-builder-4c-4g - project: 'aai/graphgraph' - project-name: 'aai-graphgraph' - branch: 'master' - mvn-settings: 'aai-graphgraph-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "aai/graphgraph" + project-name: "aai-graphgraph" + branch: "master" + mvn-settings: "aai-graphgraph-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: aai-graphgraph-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/graphgraph' - project-name: 'aai-graphgraph' + nexus-iq-namespace: "onap-" + project: "aai/graphgraph" + project-name: "aai-graphgraph" stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-graphgraph-settings' + - "master": + branch: "master" + mvn-settings: "aai-graphgraph-settings" - project: name: aai-graphgraph-info diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 18f304976..37c0b18e2 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -7,57 +7,57 @@ - project: name: aai-logging-service-master - project-name: 'aai-logging-service' + project-name: "aai-logging-service" jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - - '{project-name}-gerrit-release-jobs': + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/logging-service' + project: "aai/logging-service" stream: - - 'jakarta': - branch: 'jakarta' - - 'kohn': - branch: 'kohn' - - 'master': - branch: 'master' - mvn-settings: 'aai-logging-service-settings' - files: '**' - archive-artifacts: '' + - "jakarta": + branch: "jakarta" + - "kohn": + branch: "kohn" + - "master": + branch: "master" + mvn-settings: "aai-logging-service-settings" + files: "**" + archive-artifacts: "" - project: name: aai-logging-service-sonar jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-builder-4c-4g - project: 'aai/logging-service' - project-name: 'aai-logging-service' - branch: 'master' - mvn-settings: 'aai-logging-service-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "aai/logging-service" + project-name: "aai-logging-service" + branch: "master" + mvn-settings: "aai-logging-service-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: aai-logging-service-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/logging-service' - project-name: 'aai-logging-service' + nexus-iq-namespace: "onap-" + project: "aai/logging-service" + project-name: "aai-logging-service" stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-logging-service-settings' + - "master": + branch: "master" + mvn-settings: "aai-logging-service-settings" - project: name: aai-logging-service-info diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index c0ca71877..37cfc609b 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -7,11 +7,11 @@ - project: name: aai-model-loader-master - project-name: 'aai-model-loader' + project-name: "aai-model-loader" jobs: - gerrit-maven-verify - gerrit-maven-merge: - cron: '@daily' + cron: "@daily" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g @@ -19,60 +19,60 @@ sbom-generator: true - gerrit-maven-docker-stage: sbom-generator: true - mvn-params: '-P docker -B -Dmaven.test.skip=true' + mvn-params: "-P docker -B -Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/model-loader' + project: "aai/model-loader" stream: - - 'jakarta': - branch: 'jakarta' - - 'kohn': - branch: 'kohn' - - 'master': - branch: 'master' - mvn-settings: 'aai-model-loader-settings' - files: '**' - archive-artifacts: '' + - "jakarta": + branch: "jakarta" + - "kohn": + branch: "kohn" + - "master": + branch: "master" + mvn-settings: "aai-model-loader-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g - mvn-version: 'mvn36' + mvn-version: "mvn36" java-version: openjdk11 - nexus-snapshot-repo: 'snapshots' - mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: "snapshots" + mvn-snapshot-id: "ecomp-snapshots" - project: name: aai-model-loader-sonar jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-builder-4c-4g - project: 'aai/model-loader' - project-name: 'aai-model-loader' - branch: 'master' - mvn-settings: 'aai-model-loader-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: 'mvn36' + project: "aai/model-loader" + project-name: "aai-model-loader" + branch: "master" + mvn-settings: "aai-model-loader-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + mvn-version: "mvn36" java-version: openjdk11 - project: name: aai-model-loader-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/model-loader' - project-name: 'aai-model-loader' + nexus-iq-namespace: "onap-" + project: "aai/model-loader" + project-name: "aai-model-loader" stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-model-loader-settings' - mvn-version: 'mvn36' + - "master": + branch: "master" + mvn-settings: "aai-model-loader-settings" + mvn-version: "mvn36" java-version: openjdk11 - project: diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 0ec89a606..6487fe8e7 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -7,39 +7,39 @@ - project: name: aai-resources - project-name: 'aai-resources' + project-name: "aai-resources" jobs: - - '{project-name}-{stream}-verify-java': + - "{project-name}-{stream}-verify-java": build-node: ubuntu1804-docker-8c-8g - - '{project-name}-{stream}-merge-java': + - "{project-name}-{stream}-merge-java": build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: - mvn-params: '-DskipTests' + mvn-params: "-DskipTests" sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: sbom-generator: true - mvn-params: '-P docker -Dmaven.test.skip=true' + mvn-params: "-P docker -Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/resources' + project: "aai/resources" stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' - - 'jakarta': - branch: 'jakarta' - mvn-settings: 'aai-resources-settings' - mvn-version: 'mvn35' - files: '**' - archive-artifacts: '' + - "master": + branch: "master" + - "kohn": + branch: "kohn" + - "jakarta": + branch: "jakarta" + mvn-settings: "aai-resources-settings" + mvn-version: "mvn35" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g java-version: openjdk8 @@ -48,32 +48,32 @@ jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-docker-8c-8g - project: 'aai/resources' - project-name: 'aai-resources' - branch: 'master' - mvn-settings: 'aai-resources-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: 'mvn35' + project: "aai/resources" + project-name: "aai-resources" + branch: "master" + mvn-settings: "aai-resources-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + mvn-version: "mvn35" java-version: openjdk8 - project: name: aai-resources-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/resources' - project-name: 'aai-resources' + nexus-iq-namespace: "onap-" + project: "aai/resources" + project-name: "aai-resources" stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-resources-settings' - mvn-version: 'mvn35' + - "master": + branch: "master" + mvn-settings: "aai-resources-settings" + mvn-version: "mvn35" java-version: openjdk8 - project: diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index e6cc863c9..fa09beb6b 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -7,57 +7,57 @@ - project: name: aai-rest-client-master - project-name: 'aai-rest-client' + project-name: "aai-rest-client" jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - - '{project-name}-gerrit-release-jobs': + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/rest-client' + project: "aai/rest-client" stream: - - 'jakarta': - branch: 'jakarta' - - 'kohn': - branch: 'kohn' - - 'master': - branch: 'master' - mvn-settings: 'aai-rest-client-settings' - files: '**' - archive-artifacts: '' + - "jakarta": + branch: "jakarta" + - "kohn": + branch: "kohn" + - "master": + branch: "master" + mvn-settings: "aai-rest-client-settings" + files: "**" + archive-artifacts: "" - project: name: aai-rest-client-sonar jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-builder-4c-4g - project: 'aai/rest-client' - project-name: 'aai-rest-client' - branch: 'master' - mvn-settings: 'aai-rest-client-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "aai/rest-client" + project-name: "aai-rest-client" + branch: "master" + mvn-settings: "aai-rest-client-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: aai-rest-client-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/rest-client' - project-name: 'aai-rest-client' + nexus-iq-namespace: "onap-" + project: "aai/rest-client" + project-name: "aai-rest-client" stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-rest-client-settings' + - "master": + branch: "master" + mvn-settings: "aai-rest-client-settings" - project: name: aai-rest-client-info diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 497b44d7a..d5515a0f5 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -7,10 +7,10 @@ - project: name: aai-schema-service - project-name: 'aai-schema-service' + project-name: "aai-schema-service" jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g @@ -18,24 +18,24 @@ sbom-generator: true - gerrit-maven-docker-stage: sbom-generator: true - mvn-params: '-P docker -Dmaven.test.skip=true' + mvn-params: "-P docker -Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/schema-service' + project: "aai/schema-service" stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' - - 'jakarta': - branch: 'jakarta' - mvn-settings: 'aai-schema-service-settings' - mvn-version: 'mvn36' - files: '**' - archive-artifacts: '' + - "master": + branch: "master" + - "kohn": + branch: "kohn" + - "jakarta": + branch: "jakarta" + mvn-settings: "aai-schema-service-settings" + mvn-version: "mvn36" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g java-version: openjdk11 @@ -44,33 +44,33 @@ jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-builder-4c-4g java-version: openjdk11 - project: 'aai/schema-service' - project-name: 'aai-schema-service' - branch: 'master' - mvn-settings: 'aai-schema-service-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: 'mvn36' + project: "aai/schema-service" + project-name: "aai-schema-service" + branch: "master" + mvn-settings: "aai-schema-service-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + mvn-version: "mvn36" - project: name: aai-schema-service-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/schema-service' - project-name: 'aai-schema-service' + nexus-iq-namespace: "onap-" + project: "aai/schema-service" + project-name: "aai-schema-service" java-version: openjdk11 stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-schema-service-settings' - mvn-version: 'mvn36' + - "master": + branch: "master" + mvn-settings: "aai-schema-service-settings" + mvn-version: "mvn36" - project: name: aai-schema-service-info diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 2f6a5a91f..97eb3b1bf 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -7,11 +7,11 @@ - project: name: aai-sparky-be-master - project-name: 'aai-sparky-be' + project-name: "aai-sparky-be" jobs: - gerrit-maven-verify - gerrit-maven-merge: - cron: '@daily' + cron: "@daily" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g @@ -19,59 +19,59 @@ sbom-generator: true - gerrit-maven-docker-stage: sbom-generator: true - mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true' + mvn-params: "-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/sparky-be' + project: "aai/sparky-be" stream: - - 'jakarta': - branch: 'jakarta' - - 'kohn': - branch: 'kohn' - - 'master': - branch: 'master' - mvn-settings: 'aai-sparky-be-settings' - files: '**' - archive-artifacts: '' - mvn-version: 'mvn36' + - "jakarta": + branch: "jakarta" + - "kohn": + branch: "kohn" + - "master": + branch: "master" + mvn-settings: "aai-sparky-be-settings" + files: "**" + archive-artifacts: "" + mvn-version: "mvn36" java-version: openjdk11 - nexus-snapshot-repo: 'snapshots' - mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: "snapshots" + mvn-snapshot-id: "ecomp-snapshots" - project: name: aai-sparky-be-sonar jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-builder-4c-4g - project: 'aai/sparky-be' - project-name: 'aai-sparky-be' - branch: 'master' - mvn-settings: 'aai-sparky-be-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: 'mvn36' + project: "aai/sparky-be" + project-name: "aai-sparky-be" + branch: "master" + mvn-settings: "aai-sparky-be-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + mvn-version: "mvn36" java-version: openjdk11 - project: name: aai-sparky-be-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/sparky-be' - project-name: 'aai-sparky-be' + nexus-iq-namespace: "onap-" + project: "aai/sparky-be" + project-name: "aai-sparky-be" stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-sparky-be-settings' - mvn-version: 'mvn36' + - "master": + branch: "master" + mvn-settings: "aai-sparky-be-settings" + mvn-version: "mvn36" java-version: openjdk11 - project: diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 76942dd2f..257a6ffdc 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -1,28 +1,28 @@ --- - project: name: sparky-fe - project-name: 'aai-sparky-fe' - build-node: 'centos8-builder-4c-4g' + project-name: "aai-sparky-fe" + build-node: "centos8-builder-4c-4g" jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" - gerrit-maven-stage: build-node: ubuntu1804-builder-4c-4g maven-versions-plugin: true sbom-generator: true - - '{project-name}-gerrit-release-jobs': + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/sparky-fe' + project: "aai/sparky-fe" stream: - - 'jakarta': - branch: 'jakarta' - - 'kohn': - branch: 'kohn' - - 'master': - branch: 'master' - mvn-settings: 'aai-sparky-fe-settings' - files: '**' - archive-artifacts: '' + - "jakarta": + branch: "jakarta" + - "kohn": + branch: "kohn" + - "master": + branch: "master" + mvn-settings: "aai-sparky-fe-settings" + files: "**" + archive-artifacts: "" - project: name: aai-sparky-fe-info @@ -38,15 +38,15 @@ jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-builder-4c-4g - project: 'aai/sparky-fe' - project-name: 'aai-sparky-fe' - branch: 'master' - mvn-settings: 'aai-sparky-be-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: 'mvn35' + project: "aai/sparky-fe" + project-name: "aai-sparky-fe" + branch: "master" + mvn-settings: "aai-sparky-be-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + mvn-version: "mvn35" diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 21823ff98..2817c572c 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -7,38 +7,38 @@ - project: name: aai-traversal-master - project-name: 'aai-traversal' + project-name: "aai-traversal" jobs: - - '{project-name}-{stream}-verify-java': + - "{project-name}-{stream}-verify-java": build-node: ubuntu1804-docker-8c-8g - - '{project-name}-{stream}-merge-java': + - "{project-name}-{stream}-merge-java": build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: - mvn-params: '-DskipTests' + mvn-params: "-DskipTests" sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: sbom-generator: true - mvn-params: '-P docker -Dmaven.test.skip=true' + mvn-params: "-P docker -Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'aai/traversal' + project: "aai/traversal" stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' - - 'jakarta': - branch: 'jakarta' - mvn-settings: 'aai-traversal-settings' - mvn-version: 'mvn35' - files: '**' - archive-artifacts: '' + - "master": + branch: "master" + - "kohn": + branch: "kohn" + - "jakarta": + branch: "jakarta" + mvn-settings: "aai-traversal-settings" + mvn-version: "mvn35" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g java-version: openjdk8 @@ -47,32 +47,32 @@ jobs: - gerrit-maven-sonar sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + cron: "@daily" build-node: ubuntu1804-docker-8c-8g - project: 'aai/traversal' - project-name: 'aai-traversal' - branch: 'master' - mvn-settings: 'aai-traversal-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: 'mvn35' + project: "aai/traversal" + project-name: "aai-traversal" + branch: "master" + mvn-settings: "aai-traversal-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + mvn-version: "mvn35" java-version: openjdk8 - project: name: aai-traversal-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/traversal' - project-name: 'aai-traversal' + nexus-iq-namespace: "onap-" + project: "aai/traversal" + project-name: "aai-traversal" stream: - - 'master': - branch: 'master' - mvn-settings: 'aai-traversal-settings' - mvn-version: 'mvn35' + - "master": + branch: "master" + mvn-settings: "aai-traversal-settings" + mvn-version: "mvn35" java-version: openjdk8 - project: -- 2.16.6