From a3d1ccc52259e87b7d249d6d02542affb4bdfd6a Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Wed, 3 May 2023 09:00:07 -0700 Subject: [PATCH] Refactor: Cleanup for pre-commit Change-Id: I2a76fff56c3cb3d815b9cabe7e2fbd2d9a24b37a Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg --- jjb/so/so-adapters-so-cnf-adapter.yaml | 58 +++++++------- jjb/so/so-adapters-so-etsi-sol003-adapter.yaml | 62 +++++++-------- jjb/so/so-adapters-so-etsi-sol005-adapter.yaml | 59 +++++++------- jjb/so/so-adapters-so-nssmf-adapter.yaml | 54 ++++++------- jjb/so/so-adapters-so-oof-adapter.yaml | 58 +++++++------- jjb/so/so-csit.yaml | 24 +++--- jjb/so/so-so-admin-cockpit.yaml | 84 ++++++++++---------- jjb/so/so-so-etsi-nfvo.yaml | 58 +++++++------- jjb/so/so.yaml | 106 ++++++++++++------------- 9 files changed, 281 insertions(+), 282 deletions(-) diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml index 15935c0e6..5189c46ee 100644 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -15,10 +15,10 @@ - project: name: so-adapters-so-cnf-adapter - project-name: 'so-adapters-so-cnf-adapter' + project-name: "so-adapters-so-cnf-adapter" 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 @@ -28,19 +28,19 @@ sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + mvn-params: "-P docker -DskipTests" + 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: 'so/adapters/so-cnf-adapter' + project: "so/adapters/so-cnf-adapter" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk11 - mvn-settings: 'so-adapters-so-cnf-adapter-settings' - files: '**' - archive-artifacts: '' + mvn-settings: "so-adapters-so-cnf-adapter-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-docker-v1-8c-8g - project: @@ -49,29 +49,29 @@ 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" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g - project: 'so/adapters/so-cnf-adapter' - project-name: 'so-adapters-so-cnf-adapter' - branch: 'master' - mvn-settings: 'so-adapters-so-cnf-adapter-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "so/adapters/so-cnf-adapter" + project-name: "so-adapters-so-cnf-adapter" + branch: "master" + mvn-settings: "so-adapters-so-cnf-adapter-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: so-adapters-so-cnf-adapter-clm java-version: openjdk11 jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'so/adapters/so-cnf-adapter' - project-name: 'so-adapters-so-cnf-adapter' + nexus-iq-namespace: "onap-" + project: "so/adapters/so-cnf-adapter" + project-name: "so-adapters-so-cnf-adapter" build-node: ubuntu1804-docker-v1-8c-8g stream: - - 'master': - branch: 'master' - mvn-settings: 'so-adapters-so-cnf-adapter-settings' + - "master": + branch: "master" + mvn-settings: "so-adapters-so-cnf-adapter-settings" diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index 33898367e..372955916 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -15,10 +15,10 @@ - project: name: so-adapters-so-etsi-sol003-adapter - project-name: 'so-adapters-so-etsi-sol003-adapter' + project-name: "so-adapters-so-etsi-sol003-adapter" 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 @@ -28,22 +28,22 @@ sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + mvn-params: "-P docker -DskipTests" + 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: 'so/adapters/so-etsi-sol003-adapter' + project: "so/adapters/so-etsi-sol003-adapter" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk11 - - 'kohn': - branch: 'kohn' + - "kohn": + branch: "kohn" java-version: openjdk11 - mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' - files: '**' - archive-artifacts: '' + mvn-settings: "so-adapters-so-etsi-sol003-adapter-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-docker-v1-8c-8g - project: @@ -52,29 +52,29 @@ 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" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g - project: 'so/adapters/so-etsi-sol003-adapter' - project-name: 'so-adapters-so-etsi-sol003-adapter' - branch: 'master' - mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "so/adapters/so-etsi-sol003-adapter" + project-name: "so-adapters-so-etsi-sol003-adapter" + branch: "master" + mvn-settings: "so-adapters-so-etsi-sol003-adapter-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: so-adapters-so-etsi-sol003-adapter-clm java-version: openjdk11 jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'so/adapters/so-etsi-sol003-adapter' - project-name: 'so-adapters-so-etsi-sol003-adapter' + nexus-iq-namespace: "onap-" + project: "so/adapters/so-etsi-sol003-adapter" + project-name: "so-adapters-so-etsi-sol003-adapter" build-node: ubuntu1804-docker-v1-8c-8g stream: - - 'master': - branch: 'master' - mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' + - "master": + branch: "master" + mvn-settings: "so-adapters-so-etsi-sol003-adapter-settings" diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index 6ee65b2ed..0c75367fb 100644 --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -15,10 +15,10 @@ - project: name: so-adapters-so-etsi-sol005-adapter - project-name: 'so-adapters-so-etsi-sol005-adapter' + project-name: "so-adapters-so-etsi-sol005-adapter" 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 @@ -28,19 +28,19 @@ sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + mvn-params: "-P docker -DskipTests" + 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: 'so/adapters/so-etsi-sol005-adapter' + project: "so/adapters/so-etsi-sol005-adapter" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk11 - mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' - files: '**' - archive-artifacts: '' + mvn-settings: "so-adapters-so-etsi-sol005-adapter-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-docker-v1-8c-8g - project: @@ -49,30 +49,29 @@ 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" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g - project: 'so/adapters/so-etsi-sol005-adapter' - project-name: 'so-adapters-so-etsi-sol005-adapter' - branch: 'master' - mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - + project: "so/adapters/so-etsi-sol005-adapter" + project-name: "so-adapters-so-etsi-sol005-adapter" + branch: "master" + mvn-settings: "so-adapters-so-etsi-sol005-adapter-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: so-adapters-so-etsi-sol005-adapter-clm java-version: openjdk11 jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'so/adapters/so-etsi-sol005-adapter' - project-name: 'so-adapters-so-etsi-sol005-adapter' + nexus-iq-namespace: "onap-" + project: "so/adapters/so-etsi-sol005-adapter" + project-name: "so-adapters-so-etsi-sol005-adapter" build-node: ubuntu1804-docker-v1-8c-8g stream: - - 'master': - branch: 'master' - mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings' + - "master": + branch: "master" + mvn-settings: "so-adapters-so-etsi-sol005-adapter-settings" diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index 19c371001..e6c35462f 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -15,10 +15,10 @@ - project: name: so-adapters-so-nssmf-adapter - project-name: 'so-adapters-so-nssmf-adapter' + project-name: "so-adapters-so-nssmf-adapter" 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 @@ -28,25 +28,25 @@ sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + mvn-params: "-P docker -DskipTests" + 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: 'so/adapters/so-nssmf-adapter' + project: "so/adapters/so-nssmf-adapter" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk11 - - 'jakarta': - branch: 'jakarta' + - "jakarta": + branch: "jakarta" java-version: openjdk11 - - 'kohn': - branch: 'kohn' + - "kohn": + branch: "kohn" java-version: openjdk11 - mvn-settings: 'so-adapters-so-nssmf-adapter-settings' - files: '**' - archive-artifacts: '' + mvn-settings: "so-adapters-so-nssmf-adapter-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-docker-v1-8c-8g - project: @@ -55,15 +55,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" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g - project: 'so/adapters/so-nssmf-adapter' - project-name: 'so-adapters-so-nssmf-adapter' - branch: 'master' - mvn-settings: 'so-adapters-so-nssmf-adapter-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "so/adapters/so-nssmf-adapter" + project-name: "so-adapters-so-nssmf-adapter" + branch: "master" + mvn-settings: "so-adapters-so-nssmf-adapter-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml index b8c86e26d..16d0a5822 100644 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -15,10 +15,10 @@ - project: name: so-adapters-so-oof-adapter - project-name: 'so-adapters-so-oof-adapter' + project-name: "so-adapters-so-oof-adapter" 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 @@ -28,19 +28,19 @@ sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + mvn-params: "-P docker -DskipTests" + 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: 'so/adapters/so-oof-adapter' + project: "so/adapters/so-oof-adapter" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk11 - mvn-settings: 'so-adapters-so-oof-adapter-settings' - files: '**' - archive-artifacts: '' + mvn-settings: "so-adapters-so-oof-adapter-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-docker-v1-8c-8g - project: @@ -49,29 +49,29 @@ 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" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g - project: 'so/adapters/so-oof-adapter' - project-name: 'so-adapters-so-oof-adapter' - branch: 'master' - mvn-settings: 'so-adapters-so-oof-adapter-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "so/adapters/so-oof-adapter" + project-name: "so-adapters-so-oof-adapter" + branch: "master" + mvn-settings: "so-adapters-so-oof-adapter-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: so-adapters-so-oof-adapter-clm java-version: openjdk11 jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'so/adapters/so-oof-adapter' - project-name: 'so-adapters-so-oof-adapter' + nexus-iq-namespace: "onap-" + project: "so/adapters/so-oof-adapter" + project-name: "so-adapters-so-oof-adapter" build-node: ubuntu1804-docker-v1-8c-8g stream: - - 'master': - branch: 'master' - mvn-settings: 'so-adapters-so-oof-adapter-settings' + - "master": + branch: "master" + mvn-settings: "so-adapters-so-oof-adapter-settings" diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index 4eba714cb..1bda2bde6 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -3,22 +3,22 @@ name: so-csit java-version: openjdk11 jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'so' - recipients: 'seshu.kumar.m@huawei.com' + - "{project-name}-{stream}-verify-csit-{functionality}" + - "{project-name}-{stream}-csit-{functionality}" + project-name: "so" + recipients: "seshu.kumar.m@huawei.com" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk11 - - 'Custom_Workflow': - branch: 'Custom_Workflow' + - "Custom_Workflow": + branch: "Custom_Workflow" java-version: openjdk11 functionality: - - 'integration-etsi-testing': + - "integration-etsi-testing": trigger_jobs: - - 'macroflow': + - "macroflow": trigger_jobs: - - 'integration-cnfm-testing': + - "integration-cnfm-testing": trigger_jobs: - robot-options: '' + robot-options: "" diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml index 26070c3ae..fec0a4b21 100644 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -15,10 +15,10 @@ - project: name: so-so-admin-cockpit - project-name: 'so-so-admin-cockpit' + project-name: "so-so-admin-cockpit" 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 @@ -28,19 +28,19 @@ sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + mvn-params: "-P docker -DskipTests" + 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: 'so/so-admin-cockpit' + project: "so/so-admin-cockpit" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk11 - mvn-settings: 'so-so-admin-cockpit-settings' - files: '**' - archive-artifacts: '' + mvn-settings: "so-so-admin-cockpit-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-docker-v1-8c-8g - project: @@ -49,35 +49,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" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g - project: 'so/so-admin-cockpit' - project-name: 'so-so-admin-cockpit' - branch: 'master' - mvn-settings: 'so-so-admin-cockpit-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "so/so-admin-cockpit" + project-name: "so-so-admin-cockpit" + branch: "master" + mvn-settings: "so-so-admin-cockpit-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: - name: 'so-so-admin-cockpit-coverity' + name: "so-so-admin-cockpit-coverity" java-version: openjdk11 jobs: - - 'onap-gerrit-maven-coverity' - cron: '@daily' - build-node: 'ubuntu1804-docker-v1-8c-8g' - project: 'so/so-admin-cockpit' - project-name: 'so-so-admin-cockpit' - branch: 'master' - mvn-settings: 'so-so-admin-cockpit-settings' - mvn-params: '-DskipTests' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - coverity-project-name: 'onap-so' - coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ' - coverity-user-email: 'A.Naluzhnyy@samsung.com' + - "onap-gerrit-maven-coverity" + cron: "@daily" + build-node: "ubuntu1804-docker-v1-8c-8g" + project: "so/so-admin-cockpit" + project-name: "so-so-admin-cockpit" + branch: "master" + mvn-settings: "so-so-admin-cockpit-settings" + mvn-params: "-DskipTests" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + coverity-project-name: "onap-so" + coverity-token: "SrGGJp9T1n1lhJn2sF72XQ" + coverity-user-email: "A.Naluzhnyy@samsung.com" coverity-search-paths: > so-admin-cockpit-monitoring-workflow/so-admin-cockpit-monitoring-workflow-ui/src/main/frontend/src coverity-search-exclude-regexs: > @@ -96,11 +96,11 @@ java-version: openjdk11 jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'so/so-admin-cockpit' - project-name: 'so-so-admin-cockpit' + nexus-iq-namespace: "onap-" + project: "so/so-admin-cockpit" + project-name: "so-so-admin-cockpit" build-node: ubuntu1804-docker-v1-8c-8g stream: - - 'master': - branch: 'master' - mvn-settings: 'so-so-admin-cockpit-settings' + - "master": + branch: "master" + mvn-settings: "so-so-admin-cockpit-settings" diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml index a14563713..4738935bd 100644 --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -15,10 +15,10 @@ - project: name: so-so-etsi-nfvo - project-name: 'so-so-etsi-nfvo' + project-name: "so-so-etsi-nfvo" 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 @@ -28,19 +28,19 @@ sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + mvn-params: "-P docker -DskipTests" + 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: 'so/so-etsi-nfvo' + project: "so/so-etsi-nfvo" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk11 - mvn-settings: 'so-so-etsi-nfvo-settings' - files: '**' - archive-artifacts: '' + mvn-settings: "so-so-etsi-nfvo-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-docker-v1-8c-8g - project: @@ -49,29 +49,29 @@ 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" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g - project: 'so/so-etsi-nfvo' - project-name: 'so-so-etsi-nfvo' - branch: 'master' - mvn-settings: 'so-so-etsi-nfvo-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "so/so-etsi-nfvo" + project-name: "so-so-etsi-nfvo" + branch: "master" + mvn-settings: "so-so-etsi-nfvo-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: so-so-etsi-nfvo-clm java-version: openjdk11 jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'so/so-etsi-nfvo' - project-name: 'so-so-etsi-nfvo' + nexus-iq-namespace: "onap-" + project: "so/so-etsi-nfvo" + project-name: "so-so-etsi-nfvo" build-node: ubuntu1804-docker-v1-8c-8g stream: - - 'master': - branch: 'master' - mvn-settings: 'so-so-etsi-nfvo-settings' + - "master": + branch: "master" + mvn-settings: "so-so-etsi-nfvo-settings" diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index de5c111f2..0c70f2fb7 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -8,10 +8,10 @@ - project: name: so - project-name: 'so' + project-name: "so" 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 @@ -21,28 +21,28 @@ sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -DskipTests' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': + mvn-params: "-P docker -DskipTests" + 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: 'so' + project: "so" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk11 - - 'jakarta': - branch: 'jakarta' + - "jakarta": + branch: "jakarta" java-version: openjdk11 - - 'kohn': - branch: 'kohn' + - "kohn": + branch: "kohn" java-version: openjdk11 - - 'recursive-orch': - branch: 'recursive-orch' + - "recursive-orch": + branch: "recursive-orch" java-version: openjdk11 - mvn-settings: 'so-settings' - files: '**' - archive-artifacts: '' + mvn-settings: "so-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-docker-v1-8c-8g - project: @@ -51,35 +51,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" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g - project: 'so' - project-name: 'so' - branch: 'master' - mvn-settings: 'so-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "so" + project-name: "so" + branch: "master" + mvn-settings: "so-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: - name: 'so-coverity' + name: "so-coverity" java-version: openjdk11 jobs: - - 'onap-gerrit-maven-coverity' - cron: '@daily' - build-node: 'ubuntu1804-docker-v1-8c-8g' - project: 'so' - project-name: 'so' - branch: 'master' - mvn-settings: 'so-settings' - mvn-params: '-DskipTests' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - coverity-project-name: 'onap-so' - coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ' - coverity-user-email: 'A.Naluzhnyy@samsung.com' + - "onap-gerrit-maven-coverity" + cron: "@daily" + build-node: "ubuntu1804-docker-v1-8c-8g" + project: "so" + project-name: "so" + branch: "master" + mvn-settings: "so-settings" + mvn-params: "-DskipTests" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + coverity-project-name: "onap-so" + coverity-token: "SrGGJp9T1n1lhJn2sF72XQ" + coverity-user-email: "A.Naluzhnyy@samsung.com" coverity-search-paths: > so-monitoring/so-monitoring-ui/src/main/frontend/src coverity-search-exclude-regexs: > @@ -98,14 +98,14 @@ java-version: openjdk11 jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' + nexus-iq-namespace: "onap-" project: so - project-name: 'so' + project-name: "so" build-node: ubuntu1804-docker-v1-8c-8g stream: - - 'master': - branch: 'master' - mvn-settings: 'so-settings' + - "master": + branch: "master" + mvn-settings: "so-settings" - project: name: so-info @@ -116,12 +116,12 @@ build-node: centos8-builder-2c-1g project: so stream: - - 'master': - branch: 'master' + - "master": + branch: "master" java-version: openjdk11 - - 'jakarta': - branch: 'jakarta' + - "jakarta": + branch: "jakarta" java-version: openjdk11 - - 'kohn': - branch: 'kohn' + - "kohn": + branch: "kohn" java-version: openjdk11 -- 2.16.6