From 7fcafcf3994f0a4fada917e7401bdbd5fa72df0d Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Wed, 3 May 2023 08:49:23 -0700 Subject: Refactor: Cleanup for pre-commit Change-Id: Iae406410654e207880c15c93e9786abba9bceef4 Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg --- jjb/vvp/vvp-documentation.yaml | 6 ++-- jjb/vvp/vvp-em.yaml | 6 ++-- jjb/vvp/vvp-oom.yaml | 6 ++-- jjb/vvp/vvp-regression.yaml | 6 ++-- jjb/vvp/vvp-test-engine.yaml | 46 ++++++++++++++-------------- jjb/vvp/vvp-validation-scripts.yaml | 61 ++++++++++++++++++------------------- 6 files changed, 65 insertions(+), 66 deletions(-) (limited to 'jjb/vvp') diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml index a57ee4290..2df897d6c 100644 --- a/jjb/vvp/vvp-documentation.yaml +++ b/jjb/vvp/vvp-documentation.yaml @@ -1,9 +1,9 @@ --- - project: name: vvp-documentation - project-name: 'vvp-documentation' - project: 'vvp/documentation' - mvn-settings: 'vvp-documentation-settings' + project-name: "vvp-documentation" + project: "vvp/documentation" + mvn-settings: "vvp-documentation-settings" branch: master jobs: - gerrit-info-yaml-verify diff --git a/jjb/vvp/vvp-em.yaml b/jjb/vvp/vvp-em.yaml index f30f0d4d9..99c040943 100644 --- a/jjb/vvp/vvp-em.yaml +++ b/jjb/vvp/vvp-em.yaml @@ -1,9 +1,9 @@ --- - project: name: vvp-engagementmgr - project-name: 'vvp-engagementmgr' - project: 'vvp/engagementmgr' - mvn-settings: 'vvp-engagementmgr-settings' + project-name: "vvp-engagementmgr" + project: "vvp/engagementmgr" + mvn-settings: "vvp-engagementmgr-settings" branch: master jobs: - gerrit-info-yaml-verify diff --git a/jjb/vvp/vvp-oom.yaml b/jjb/vvp/vvp-oom.yaml index 3c2442791..3da6dcd30 100644 --- a/jjb/vvp/vvp-oom.yaml +++ b/jjb/vvp/vvp-oom.yaml @@ -1,9 +1,9 @@ --- - project: name: vvp-oom - project-name: 'vvp-oom' - project: 'vvp/oom' - mvn-settings: 'vvp-oom-settings' + project-name: "vvp-oom" + project: "vvp/oom" + mvn-settings: "vvp-oom-settings" branch: master jobs: - gerrit-info-yaml-verify diff --git a/jjb/vvp/vvp-regression.yaml b/jjb/vvp/vvp-regression.yaml index 0de82d8a8..265d70f7f 100644 --- a/jjb/vvp/vvp-regression.yaml +++ b/jjb/vvp/vvp-regression.yaml @@ -1,9 +1,9 @@ --- - project: name: vvp-regression-tests - project-name: 'vvp-regression-tests' - project: 'vvp/regression-tests' - mvn-settings: 'vvp-regression-tests-settings' + project-name: "vvp-regression-tests" + project: "vvp/regression-tests" + mvn-settings: "vvp-regression-tests-settings" branch: master jobs: - gerrit-info-yaml-verify diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml index 0a73df7e8..e9be3d35e 100644 --- a/jjb/vvp/vvp-test-engine.yaml +++ b/jjb/vvp/vvp-test-engine.yaml @@ -1,9 +1,9 @@ --- - project: name: vvp-test-engine-info - project-name: 'vvp-test-engine' - project: 'vvp/test-engine' - mvn-settings: 'vvp-test-engine-settings' + project-name: "vvp-test-engine" + project: "vvp/test-engine" + mvn-settings: "vvp-test-engine-settings" branch: master jobs: - gerrit-info-yaml-verify @@ -14,30 +14,30 @@ 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: 'vvp/test-engine' - project-name: 'vvp-test-engine' - branch: 'master' - mvn-settings: 'vvp-test-engine-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "vvp/test-engine" + project-name: "vvp-test-engine" + branch: "master" + mvn-settings: "vvp-test-engine-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: vvp-test-engine-verify - project-name: 'vvp-test-engine' - project: 'vvp/test-engine' + project-name: "vvp-test-engine" + project: "vvp/test-engine" stream: - - 'master': - branch: 'master' - mvn-settings: 'vvp-test-engine-settings' - build-node: 'centos8-builder-4c-4g' + - "master": + branch: "master" + mvn-settings: "vvp-test-engine-settings" + build-node: "centos8-builder-4c-4g" subproject: - - 'onap-client': - path: 'onap-client' - pattern: 'onap-client/**' + - "onap-client": + path: "onap-client" + pattern: "onap-client/**" jobs: - - '{project-name}-{stream}-{subproject}-verify-python' + - "{project-name}-{stream}-{subproject}-verify-python" diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index 10c369e7a..d6539996f 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -1,56 +1,55 @@ --- - - project: name: vvp-validation-scripts - project-name: 'vvp-validation-scripts' - project: 'vvp/validation-scripts' + project-name: "vvp-validation-scripts" + project: "vvp/validation-scripts" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" subproject: - validation-scripts: - path: '.' - pattern: '**' - mvn-settings: 'vvp-validation-scripts-settings' + path: "." + pattern: "**" + mvn-settings: "vvp-validation-scripts-settings" build-node: ubuntu1804-docker-8c-8g jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - - '{project-name}-gerrit-release-jobs': + - "{project-name}-{stream}-{subproject}-verify-python" + - "{project-name}-{stream}-docker-java-daily": + mvn-params: "-Dmaven.test.skip=true" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - docker-pom: 'pom.xml' - mvn-profile: 'default' + docker-pom: "pom.xml" + mvn-profile: "default" - project: name: vvp-validation-scripts-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-docker-8c-8g - project: 'vvp/validation-scripts' - project-name: 'vvp-validation-scripts' - branch: 'master' - mvn-settings: 'vvp-validation-scripts-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "vvp/validation-scripts" + project-name: "vvp-validation-scripts" + branch: "master" + mvn-settings: "vvp-validation-scripts-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: vvp-validation-scripts-tracability-matrix - project: 'vvp/validation-scripts' - project-name: 'vvp-validation-scripts' + project: "vvp/validation-scripts" + project-name: "vvp-validation-scripts" build-node: ubuntu1804-docker-8c-8g - mvn-settings: 'vvp-validation-scripts-settings' - mvn-global-settings: 'global-settings' + mvn-settings: "vvp-validation-scripts-settings" + mvn-global-settings: "global-settings" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" jobs: - - '{project-name}-{stream}-build-and-upload': + - "{project-name}-{stream}-build-and-upload": pre_script: !include-raw-escape: pre-build-csv.sh artifact_name: traceability.csv rst.csv project_id: org.onap.vvp.validation-scripts -- cgit 1.2.3-korg