From: Andrew Grimberg Date: Wed, 3 May 2023 15:58:48 +0000 (-0700) Subject: Refactor: Cleanup for pre-commit X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ac603ba604e4ffa9eed4806a4f95e8f41b9d2c27;p=ci-management.git Refactor: Cleanup for pre-commit Change-Id: I0e01f2b701bc46fe5dd7b4e6187444efb7cac53a Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg --- diff --git a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml index 269b5cbfe..80e4a1b9f 100644 --- a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml +++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml @@ -10,36 +10,36 @@ - project: name: testsuite-pythonsdk-tests-linters - project: 'testsuite/pythonsdk-tests' - project-name: 'testsuite-pythonsdk-tests' + project: "testsuite/pythonsdk-tests" + project-name: "testsuite-pythonsdk-tests" python-version: python3 jobs: - integration-linters subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - - 'python': - tox-dir: '.' - tox-envs: 'py' - pattern: '**/*.py' - - 'rst': - tox-dir: '.' - tox-envs: 'rst' - pattern: '**/*.rst' - - 'md': - tox-dir: '.' - tox-envs: 'md' - pattern: '**/*.md' + - "yaml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yaml" + - "yml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yml" + - "json": + tox-dir: "." + tox-envs: "json" + pattern: "**/*.json" + - "python": + tox-dir: "." + tox-envs: "py" + pattern: "**/*.py" + - "rst": + tox-dir: "." + tox-envs: "rst" + pattern: "**/*.rst" + - "md": + tox-dir: "." + tox-envs: "md" + pattern: "**/*.md" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" diff --git a/jjb/testsuite/testsuite-cds-mock-odl.yaml b/jjb/testsuite/testsuite-cds-mock-odl.yaml index 7542c2be0..6ac651190 100644 --- a/jjb/testsuite/testsuite-cds-mock-odl.yaml +++ b/jjb/testsuite/testsuite-cds-mock-odl.yaml @@ -15,56 +15,56 @@ - project: name: testsuite-cds-mock-odl-linters - project: 'testsuite/cds-mock-odl' - project-name: 'testsuite-cds-mock-odl' + project: "testsuite/cds-mock-odl" + project-name: "testsuite-cds-mock-odl" python-version: python3 jobs: - integration-linters subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - - 'python': - tox-dir: '.' - tox-envs: 'py' - pattern: '**/*.py' - - 'md': - tox-dir: '.' - tox-envs: 'md' - pattern: '**/*.md' + - "yaml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yaml" + - "yml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yml" + - "json": + tox-dir: "." + tox-envs: "json" + pattern: "**/*.json" + - "python": + tox-dir: "." + tox-envs: "py" + pattern: "**/*.py" + - "md": + tox-dir: "." + tox-envs: "md" + pattern: "**/*.md" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" - project: - name: 'testsuite-cds-mock-odl-docker' + name: "testsuite-cds-mock-odl-docker" jobs: - gerrit-docker-verify: - project-name: 'testsuite-cds-mock-odl' + project-name: "testsuite-cds-mock-odl" docker-root: . - docker-name: 'onap/cds-mock-odl' - docker-build-args: '-f ./docker/Dockerfile' + docker-name: "onap/cds-mock-odl" + docker-build-args: "-f ./docker/Dockerfile" - gerrit-docker-merge: - project-name: 'testsuite-cds-mock-odl' + project-name: "testsuite-cds-mock-odl" docker-root: . - docker-name: 'onap/cds-mock-odl' - docker-build-args: '-f ./docker/Dockerfile' - project: 'testsuite/cds-modk-odl' + docker-name: "onap/cds-mock-odl" + docker-build-args: "-f ./docker/Dockerfile" + project: "testsuite/cds-modk-odl" stream: - - 'master': - branch: 'master' - files: '' - docker-root: '$WORKSPACE' - mvn-settings: 'testsuite-cds-mock-odl-settings' + - "master": + branch: "master" + files: "" + docker-root: "$WORKSPACE" + mvn-settings: "testsuite-cds-mock-odl-settings" build-node: ubuntu1804-docker-8c-8g - cron: '@daily' + cron: "@daily" container-tag-method: stream diff --git a/jjb/testsuite/testsuite-cds-mock-server.yaml b/jjb/testsuite/testsuite-cds-mock-server.yaml index 62f712f54..e2aa1c6fb 100644 --- a/jjb/testsuite/testsuite-cds-mock-server.yaml +++ b/jjb/testsuite/testsuite-cds-mock-server.yaml @@ -15,33 +15,32 @@ - project: name: testsuite-cds-mock-server-linters - project: 'testsuite/cds-mock-server' - project-name: 'testsuite-cds-mock-server' + project: "testsuite/cds-mock-server" + project-name: "testsuite-cds-mock-server" python-version: python3 jobs: - integration-linters subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - - 'python': - tox-dir: '.' - tox-envs: 'py' - pattern: '**/*.py' - - 'md': - tox-dir: '.' - tox-envs: 'md' - pattern: '**/*.md' + - "yaml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yaml" + - "yml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yml" + - "json": + tox-dir: "." + tox-envs: "json" + pattern: "**/*.json" + - "python": + tox-dir: "." + tox-envs: "py" + pattern: "**/*.py" + - "md": + tox-dir: "." + tox-envs: "md" + pattern: "**/*.md" stream: - - 'master': - branch: 'master' - + - "master": + branch: "master" diff --git a/jjb/testsuite/testsuite-cds-mock-ssh.yaml b/jjb/testsuite/testsuite-cds-mock-ssh.yaml index 4c0ece378..1812bc797 100644 --- a/jjb/testsuite/testsuite-cds-mock-ssh.yaml +++ b/jjb/testsuite/testsuite-cds-mock-ssh.yaml @@ -15,33 +15,32 @@ - project: name: testsuite-cds-mock-ssh-linters - project: 'testsuite/cds-mock-ssh' - project-name: 'testsuite-cds-mock-ssh' + project: "testsuite/cds-mock-ssh" + project-name: "testsuite-cds-mock-ssh" python-version: python3 jobs: - integration-linters subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - - 'python': - tox-dir: '.' - tox-envs: 'py' - pattern: '**/*.py' - - 'md': - tox-dir: '.' - tox-envs: 'md' - pattern: '**/*.md' + - "yaml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yaml" + - "yml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yml" + - "json": + tox-dir: "." + tox-envs: "json" + pattern: "**/*.json" + - "python": + tox-dir: "." + tox-envs: "py" + pattern: "**/*.py" + - "md": + tox-dir: "." + tox-envs: "md" + pattern: "**/*.md" stream: - - 'master': - branch: 'master' - + - "master": + branch: "master" diff --git a/jjb/testsuite/testsuite-cds.yaml b/jjb/testsuite/testsuite-cds.yaml index 77b460699..ac699522a 100644 --- a/jjb/testsuite/testsuite-cds.yaml +++ b/jjb/testsuite/testsuite-cds.yaml @@ -9,32 +9,32 @@ - project: name: testsuite-cds-linters - project: 'testsuite/cds' - project-name: 'testsuite-cds' + project: "testsuite/cds" + project-name: "testsuite-cds" python-version: python3 jobs: - integration-linters subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - - 'python': - tox-dir: '.' - tox-envs: 'py' - pattern: '**/*.py' - - 'md': - tox-dir: '.' - tox-envs: 'md' - pattern: '**/*.md' + - "yaml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yaml" + - "yml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yml" + - "json": + tox-dir: "." + tox-envs: "json" + pattern: "**/*.json" + - "python": + tox-dir: "." + tox-envs: "py" + pattern: "**/*.py" + - "md": + tox-dir: "." + tox-envs: "md" + pattern: "**/*.md" stream: - - 'master': - branch: 'master' + - "master": + branch: "master" diff --git a/jjb/testsuite/testsuite-oom.yaml b/jjb/testsuite/testsuite-oom.yaml index 14ce6e46c..a5b86f5fc 100644 --- a/jjb/testsuite/testsuite-oom.yaml +++ b/jjb/testsuite/testsuite-oom.yaml @@ -7,4 +7,3 @@ build-node: centos8-builder-2c-1g project: testsuite/oom branch: master - diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index e4983fdc2..69de692dc 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -1,39 +1,39 @@ --- - project: name: testsuite-python-testing-utils - project-name: 'testsuite-python-testing-utils' + project-name: "testsuite-python-testing-utils" python-version: python3 jobs: - - '{project-name}-{subproject}-python-staging-{stream}' - - '{project-name}-{subproject}-python-release-{stream}' - project: 'testsuite/python-testing-utils' + - "{project-name}-{subproject}-python-staging-{stream}" + - "{project-name}-{subproject}-python-release-{stream}" + project: "testsuite/python-testing-utils" subproject: - - 'robotframework-onap': - tox-dir: './robotframework-onap/' - tox-envs: 'py3' + - "robotframework-onap": + tox-dir: "./robotframework-onap/" + tox-envs: "py3" stream: - - 'master': - branch: 'master' - mvn-settings: 'testsuite-python-testing-utils-settings' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-builder-4c-4g' + - "master": + branch: "master" + mvn-settings: "testsuite-python-testing-utils-settings" + files: "**" + archive-artifacts: "" + build-node: "ubuntu1804-builder-4c-4g" - project: name: testsuite-python-testing-utils-verify - project-name: 'testsuite-python-testing-utils' - project: 'testsuite/python-testing-utils' + project-name: "testsuite-python-testing-utils" + project: "testsuite/python-testing-utils" stream: - - 'master': - branch: 'master' - mvn-settings: 'testsuite-python-testing-utils-settings' - build-node: 'ubuntu1804-builder-4c-4g' + - "master": + branch: "master" + mvn-settings: "testsuite-python-testing-utils-settings" + build-node: "ubuntu1804-builder-4c-4g" subproject: - - 'robotframework-onap': - path: 'robotframework-onap' - pattern: 'robotframework-onap/**' + - "robotframework-onap": + path: "robotframework-onap" + pattern: "robotframework-onap/**" jobs: - - '{project-name}-{stream}-{subproject}-verify-python' + - "{project-name}-{stream}-{subproject}-verify-python" - project: name: testsuite-python-testing-utils-info diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index ae7062f06..827aec93d 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -7,27 +7,26 @@ - project: name: testsuite-release - project-name: 'testsuite' - project: 'testsuite' - mvn-settings: 'testsuite-settings' + project-name: "testsuite" + project: "testsuite" + mvn-settings: "testsuite-settings" jobs: - - '{project-name}-gerrit-release-jobs': + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: name: testsuite - project-name: 'testsuite' + project-name: "testsuite" jobs: - - '{project-name}-{stream}-3scm-docker-shell-daily': - script: - !include-raw-escape: 'testsuite-docker.sh' + - "{project-name}-{stream}-3scm-docker-shell-daily": + script: !include-raw-escape: "testsuite-docker.sh" - project: 'testsuite' + project: "testsuite" stream: - - 'master': - branch: 'master' - mvn-settings: 'testsuite-settings' + - "master": + branch: "master" + mvn-settings: "testsuite-settings" - project: name: testsuite-info @@ -40,28 +39,28 @@ - project: name: testsuite-linters - project: 'testsuite' - project-name: 'testsuite' + project: "testsuite" + project-name: "testsuite" python-version: python3 jobs: - integration-linters subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'json': - tox-dir: '.' - tox-envs: 'json' - pattern: '**/*.json' - - 'robot': - tox-dir: '.' - tox-envs: 'robot' - pattern: 'robot/testsuites/usecases/*.robot' + - "yaml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yaml" + - "yml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yml" + - "json": + tox-dir: "." + tox-envs: "json" + pattern: "**/*.json" + - "robot": + tox-dir: "." + tox-envs: "robot" + pattern: "robot/testsuites/usecases/*.robot" stream: - - 'master': - branch: 'master' + - "master": + branch: "master"