From 02923abe1f578a4b9320d874a282c26841f17266 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Wed, 3 May 2023 09:15:50 -0700 Subject: [PATCH] Refactor: Cleanup for pre-commit Change-Id: I939d6f003864abb1b09c2e040d1f30558806cff3 Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg --- .../oom-platform-cert-service-csit.yaml | 33 +++--- .../oom-platform-cert-service.yaml | 128 ++++++++++----------- jjb/oom/offline-installer.yaml | 82 ++++++------- jjb/oom/oom-consul.yaml | 79 +++++++------ jjb/oom/oom-image-verify.yaml | 44 +++---- jjb/oom/oom-jobs.yaml | 33 +++--- jjb/oom/oom-oneclick-config.yaml | 44 +++---- jjb/oom/oom-readiness.yaml | 68 +++++------ jjb/oom/oom-registrator.yaml | 38 +++--- jjb/oom/oom-templates.yaml | 38 +++--- 10 files changed, 293 insertions(+), 294 deletions(-) diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml index c5845525f..46b1099be 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml @@ -1,18 +1,19 @@ +--- # Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed - project: - name: oom-platform-cert-service-csit - jobs: - - "{project-name}-{stream}-verify-csit-{functionality}" - - "{project-name}-{stream}-csit-{functionality}" - project-name: "oom-platform-cert-service" - stream: - - "master": - branch: "master" - - "kohn": - branch: "kohn" - functionality: - - "certservice": - trigger_jobs: - - "postprocessor": - trigger_jobs: - robot-options: "" + name: oom-platform-cert-service-csit + jobs: + - "{project-name}-{stream}-verify-csit-{functionality}" + - "{project-name}-{stream}-csit-{functionality}" + project-name: "oom-platform-cert-service" + stream: + - "master": + branch: "master" + - "kohn": + branch: "kohn" + functionality: + - "certservice": + trigger_jobs: + - "postprocessor": + trigger_jobs: + robot-options: "" diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml index 81ffecbb4..540746a74 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -14,71 +14,71 @@ - gerrit-info-yaml-verify - project: - name: oom-platform-cert-service - project-name: 'oom-platform-cert-service' - stream: - - 'master': - branch: 'master' - java-version: openjdk11 - - 'kohn': - branch: 'kohn' - java-version: openjdk11 - project: 'oom/platform/cert-service' - mvn-settings: 'oom-platform-cert-service-settings' - files: '**' - maven-deploy-properties: | - deployAtEnd=true - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - jobs: - - '{project-name}-{stream}-verify-java': - mvn-goals: 'clean install' - - '{project-name}-{stream}-merge-java': - mvn-goals: 'clean deploy' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-1g - - gerrit-maven-stage: - sbom-generator: true - sign-artifacts: true - build-node: centos8-docker-8c-8g - maven-versions-plugin: true - mvn-goals: 'clean deploy -P docker' - - gerrit-maven-docker-stage: - sbom-generator: true - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' + name: oom-platform-cert-service + project-name: "oom-platform-cert-service" + stream: + - "master": + branch: "master" + java-version: openjdk11 + - "kohn": + branch: "kohn" + java-version: openjdk11 + project: "oom/platform/cert-service" + mvn-settings: "oom-platform-cert-service-settings" + files: "**" + maven-deploy-properties: | + deployAtEnd=true + archive-artifacts: "" + build-node: ubuntu1804-docker-8c-8g + jobs: + - "{project-name}-{stream}-verify-java": + mvn-goals: "clean install" + - "{project-name}-{stream}-merge-java": + mvn-goals: "clean deploy" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-8c-8g + maven-versions-plugin: true + mvn-goals: "clean deploy -P docker" + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false" - project: - name: oom-platform-cert-service-sonar - subproject: 'oom-platform-cert-service' - path: 'certService' - java-version: openjdk11 - 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' - build-node: ubuntu1804-docker-8c-8g - project: 'oom/platform/cert-service' - project-name: 'oom-platform-cert-service' - branch: 'master' - mvn-settings: 'oom-platform-cert-service-settings' - mvn-pom: 'certService/pom.xml' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + name: oom-platform-cert-service-sonar + subproject: "oom-platform-cert-service" + path: "certService" + java-version: openjdk11 + 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" + build-node: ubuntu1804-docker-8c-8g + project: "oom/platform/cert-service" + project-name: "oom-platform-cert-service" + branch: "master" + mvn-settings: "oom-platform-cert-service-settings" + mvn-pom: "certService/pom.xml" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: - name: oom-platform-cert-service-clm - java-version: openjdk11 - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: oom/platform/cert-service - project-name: 'oom-platform-cert-service' - branch: 'master' - build-node: ubuntu1804-docker-8c-8g - mvn-settings: 'oom-platform-cert-service-settings' + name: oom-platform-cert-service-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: "onap-" + project: oom/platform/cert-service + project-name: "oom-platform-cert-service" + branch: "master" + build-node: ubuntu1804-docker-8c-8g + mvn-settings: "oom-platform-cert-service-settings" diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index 3ce7466f5..55e44ede3 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -1,19 +1,19 @@ --- - project: name: offline-installer - project-name: 'offline-installer' - build-node: 'ubuntu1804-docker-8c-8g' + project-name: "offline-installer" + build-node: "ubuntu1804-docker-8c-8g" offline_review_bootstrap: !include-raw-escape: offline-installer-review-bootstrap.sh stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' + - "master": + branch: "master" + - "kohn": + branch: "kohn" jobs: - - '{project-name}-{stream}-review': - build_script: '{offline_review_bootstrap}' + - "{project-name}-{stream}-review": + build_script: "{offline_review_bootstrap}" - project: name: offline-installer-info @@ -25,38 +25,38 @@ branch: master - project: - name: offline-installer-linters - project: oom/offline-installer - project-name: offline-installer - python-version: python3 - jobs: - - integration-linters - subproject: - - 'py': - tox-dir: '.' - tox-envs: 'py' - pattern: '**/*.py' - stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' + name: offline-installer-linters + project: oom/offline-installer + project-name: offline-installer + python-version: python3 + jobs: + - integration-linters + subproject: + - "py": + tox-dir: "." + tox-envs: "py" + pattern: "**/*.py" + stream: + - "master": + branch: "master" + - "kohn": + branch: "kohn" - project: - name: offline-installer-pytest - project: oom/offline-installer - project-name: offline-installer - build-node: ubuntu1804-docker-8c-8g - python-version: python3 - jobs: - - integration-tox-verify - subproject: - - 'docker-downloader': - tox-dir: 'build/download' - tox-envs: 'pytest' - pattern: 'build/download/**' - stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' + name: offline-installer-pytest + project: oom/offline-installer + project-name: offline-installer + build-node: ubuntu1804-docker-8c-8g + python-version: python3 + jobs: + - integration-tox-verify + subproject: + - "docker-downloader": + tox-dir: "build/download" + tox-envs: "pytest" + pattern: "build/download/**" + stream: + - "master": + branch: "master" + - "kohn": + branch: "kohn" diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml index 843914b77..a660cee81 100644 --- a/jjb/oom/oom-consul.yaml +++ b/jjb/oom/oom-consul.yaml @@ -14,52 +14,51 @@ - gerrit-info-yaml-verify - project: - name: oom-consul-linters - project: oom/consul - project-name: oom-consul - python-version: python3 - jobs: - - oom-linters - subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'py': - tox-dir: '.' - tox-envs: 'python' - pattern: '**/*.python' - stream: - - 'master': - branch: 'master' - + name: oom-consul-linters + project: oom/consul + project-name: oom-consul + python-version: python3 + jobs: + - oom-linters + subproject: + - "yaml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yaml" + - "yml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yml" + - "py": + tox-dir: "." + tox-envs: "python" + pattern: "**/*.python" + stream: + - "master": + branch: "master" - project: - name: oom-consul-release - project-name: oom-consul - project: oom/consul - mvn-settings: 'oom-settings' - jobs: - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-2c-1g + name: oom-consul-release + project-name: oom-consul + project: oom/consul + mvn-settings: "oom-settings" + jobs: + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g - project: - name: 'oom-consul-docker' + name: "oom-consul-docker" jobs: - gerrit-docker-verify - gerrit-docker-merge - project-name: 'oom-consul' - project: 'oom/consul' + project-name: "oom-consul" + project: "oom/consul" stream: - - 'master': - branch: 'master' - files: '' - docker-name: 'onap/oom/consul' - docker-build-args: '-f ./Dockerfile' - docker-root: '$WORKSPACE' - mvn-settings: 'oom-settings' + - "master": + branch: "master" + files: "" + docker-name: "onap/oom/consul" + docker-build-args: "-f ./Dockerfile" + docker-root: "$WORKSPACE" + mvn-settings: "oom-settings" build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/oom/oom-image-verify.yaml b/jjb/oom/oom-image-verify.yaml index 8ac6e3a25..7e306882a 100644 --- a/jjb/oom/oom-image-verify.yaml +++ b/jjb/oom/oom-image-verify.yaml @@ -1,53 +1,53 @@ --- - job-template: - name: '{project-name}-{stream}-image-verify' + name: "{project-name}-{stream}-image-verify" concurrent: true branch: master submodule-recursive: true - build_script: '' - git-url: '$GIT_URL/$PROJECT' - post_build_script: '' - pre_build_script: '' + build_script: "" + git-url: "$GIT_URL/$PROJECT" + post_build_script: "" + pre_build_script: "" submodule-disable: false submodule-timeout: 10 project-type: freestyle - node: '{build-node}' + node: "{build-node}" properties: - lf-infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - lf-infra-parameters: - branch: '{branch}' - project: '{project}' - stream: '{stream}' - lftools-version: '{lftools-version}' + branch: "{branch}" + project: "{project}" + stream: "{stream}" + lftools-version: "{lftools-version}" wrappers: - lf-infra-wrappers: - build-timeout: '{build-timeout}' - jenkins-ssh-credential: '{jenkins-ssh-credential}' + build-timeout: "{build-timeout}" + jenkins-ssh-credential: "{jenkins-ssh-credential}" publishers: - lf-infra-publish scm: - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' + refspec: "$GERRIT_REFSPEC" + choosing-strategy: "gerrit" + submodule-recursive: "{submodule-recursive}" triggers: - gerrit-trigger-helm-patch-submitted: - status-context: '{project}-Helm-Verify' - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: '{files}' + status-context: "{project}-Helm-Verify" + server: "{server-name}" + project: "{project}" + branch: "{branch}" + files: "{files}" builders: - lf-infra-pre-build - - shell: 'cd kubernetes; make check-for-staging-images 2>&1' + - shell: "cd kubernetes; make check-for-staging-images 2>&1" diff --git a/jjb/oom/oom-jobs.yaml b/jjb/oom/oom-jobs.yaml index 5f95f70b8..ea1529755 100644 --- a/jjb/oom/oom-jobs.yaml +++ b/jjb/oom/oom-jobs.yaml @@ -1,34 +1,33 @@ --- - job-template: - name: '{project-name}-{stream}-review' - node: '{build-node}' + name: "{project-name}-{stream}-review" + node: "{build-node}" project-type: freestyle - build_script: '' - pattern: '**' + build_script: "" + pattern: "**" parameters: - lf-infra-parameters: - branch: '{branch}' - project: 'oom/{project-name}' - stream: '{stream}' - lftools-version: '{lftools-version}' + branch: "{branch}" + project: "oom/{project-name}" + stream: "{stream}" + lftools-version: "{lftools-version}" scm: - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - submodule-recursive: '{submodule-recursive}' - choosing-strategy: 'gerrit' + refspec: "$GERRIT_REFSPEC" + submodule-recursive: "{submodule-recursive}" + choosing-strategy: "gerrit" triggers: - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: 'oom/{project-name}' - branch: '{branch}' - files: '{obj:pattern}' + server: "{server-name}" + project: "oom/{project-name}" + branch: "{branch}" + files: "{obj:pattern}" builders: - - shell: '{obj:build_script}' + - shell: "{obj:build_script}" publishers: - lf-infra-publish - diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml index 52cdd85de..670d1faa8 100644 --- a/jjb/oom/oom-oneclick-config.yaml +++ b/jjb/oom/oom-oneclick-config.yaml @@ -6,27 +6,27 @@ - project-view - project: - name: oomconfig - project-name: 'oomconfig' - project: 'oom' - - files: '**' - archive-artifacts: '' - build-timeout: 60 - build-node: ubuntu1804-docker-8c-8g - submodule-recursive: true - - jobs: - - '{project}-{stream}-release-config' - stream: - - 'master': - branch: 'master' - mvn-settings: 'oom-settings' + name: oomconfig + project-name: "oomconfig" + project: "oom" + + files: "**" + archive-artifacts: "" + build-timeout: 60 + build-node: ubuntu1804-docker-8c-8g + submodule-recursive: true + + jobs: + - "{project}-{stream}-release-config" + stream: + - "master": + branch: "master" + mvn-settings: "oom-settings" - job-template: - name: '{project}-{stream}-release-config' + name: "{project}-{stream}-release-config" project-type: freestyle - node: '{build-node}' + node: "{build-node}" properties: - infra-properties: @@ -34,13 +34,13 @@ scm: - gerrit-trigger-scm: - refspec: 'refs/heads/master' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' + refspec: "refs/heads/master" + choosing-strategy: "gerrit" + submodule-recursive: "{submodule-recursive}" wrappers: - infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: "{build-timeout}" builders: - docker-login diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml index 9ab171190..c804841d7 100644 --- a/jjb/oom/oom-readiness.yaml +++ b/jjb/oom/oom-readiness.yaml @@ -9,51 +9,51 @@ branch: master - project: - name: oom-readiness-linters - project: oom/readiness - project-name: oom-readiness - python-version: python3 - jobs: - - oom-linters - subproject: - - 'yaml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yaml' - - 'yml': - tox-dir: '.' - tox-envs: 'yaml' - pattern: '**/*.yml' - - 'py': - tox-dir: '.' - tox-envs: 'python' - pattern: '**/*.python' - stream: - - 'master': - branch: 'master' + name: oom-readiness-linters + project: oom/readiness + project-name: oom-readiness + python-version: python3 + jobs: + - oom-linters + subproject: + - "yaml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yaml" + - "yml": + tox-dir: "." + tox-envs: "yaml" + pattern: "**/*.yml" + - "py": + tox-dir: "." + tox-envs: "python" + pattern: "**/*.python" + stream: + - "master": + branch: "master" - project: name: oom-readiness-release project-name: oom-readiness project: oom/readiness - mvn-settings: 'oom-settings' + mvn-settings: "oom-settings" jobs: - - '{project-name}-gerrit-release-jobs': + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: - name: 'oom-readiness-docker' + name: "oom-readiness-docker" jobs: - gerrit-docker-verify - gerrit-docker-merge - project-name: 'oom-readiness' - project: 'oom/readiness' + project-name: "oom-readiness" + project: "oom/readiness" stream: - - 'master': - branch: 'master' - files: '' - docker-name: 'onap/oom/readiness' - docker-build-args: '-f ./Dockerfile' - docker-root: '$WORKSPACE' - mvn-settings: 'oom-settings' + - "master": + branch: "master" + files: "" + docker-name: "onap/oom/readiness" + docker-build-args: "-f ./Dockerfile" + docker-root: "$WORKSPACE" + mvn-settings: "oom-settings" build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index e3caeb2c1..64370f3cd 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -1,44 +1,44 @@ --- - project: name: oom-registrator - project-name: 'oom-registrator' + project-name: "oom-registrator" 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}-{stream}-release-version-java-daily' + - "{project-name}-{stream}-release-version-java-daily" - gerrit-maven-docker-stage: sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - mvn-pom: 'pom.xml' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-f pom.xml -Dmaven.test.skip=true -P linux,docker' - - '{project-name}-gerrit-release-jobs': + mvn-pom: "pom.xml" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-f pom.xml -Dmaven.test.skip=true -P linux,docker" + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - project: 'oom/registrator' + project: "oom/registrator" stream: - - 'master': - branch: 'master' - mvn-settings: 'oom-registrator-settings' - files: '**' - archive-artifacts: '' + - "master": + branch: "master" + mvn-settings: "oom-registrator-settings" + files: "**" + archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g - project: name: oom-registrator-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' + nexus-iq-namespace: "onap-" project: oom/registrator - project-name: 'oom-registrator' - branch: 'master' - mvn-settings: 'oom-registrator-settings' + project-name: "oom-registrator" + branch: "master" + mvn-settings: "oom-registrator-settings" - project: name: oom-registrator-info diff --git a/jjb/oom/oom-templates.yaml b/jjb/oom/oom-templates.yaml index 3134bef03..fa4d55e41 100644 --- a/jjb/oom/oom-templates.yaml +++ b/jjb/oom/oom-templates.yaml @@ -8,48 +8,48 @@ # tox-dir: Directory containing the project's tox.ini # pattern: List of file patterns to scan - name: '{project-name}-{stream}-{subproject}-lint' + name: "{project-name}-{stream}-{subproject}-lint" id: oom-linters project-type: freestyle - description: 'Job intended for running linters with Tox and Coala' + description: "Job intended for running linters with Tox and Coala" build-node: ubuntu1804-builder-4c-4g - node: '{build-node}' + node: "{build-node}" parameters: - lf-infra-parameters: - project: '{project}' - stream: '{stream}' - branch: '{branch}' + project: "{project}" + stream: "{stream}" + branch: "{branch}" - lf-infra-tox-parameters: - tox-dir: '{tox-dir}' - tox-envs: '{tox-envs}' + tox-dir: "{tox-dir}" + tox-envs: "{tox-envs}" properties: - infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" scm: - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' + refspec: "$GERRIT_REFSPEC" + choosing-strategy: "gerrit" + submodule-recursive: "{submodule-recursive}" wrappers: - infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: "{build-timeout}" triggers: - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: '{pattern}' + server: "{server-name}" + project: "{project}" + branch: "{branch}" + files: "{pattern}" builders: - lf-infra-tox-install: - python-version: '{python-version}' + python-version: "{python-version}" - lf-infra-tox-run: - parallel: 'false' + parallel: "false" publishers: - lf-infra-publish -- 2.16.6