From ed5cccdfd16ffd2993c0f5363a1290e0f14ad8c3 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Wed, 3 May 2023 09:14:10 -0700 Subject: [PATCH] Refactor: Cleanup for pre-commit Change-Id: I51f9e6b371807e21a295f4d978251723824158b4 Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg --- jjb/oparent/oparent.yaml | 32 +++++++-------- jjb/openci/openci-onap-daily-jobs.yaml | 30 +++++++------- jjb/optf/optf-has-csit.yaml | 19 ++++----- jjb/optf/optf-has.yaml | 72 +++++++++++++++++----------------- jjb/optf/optf-osdf-csit.yaml | 19 ++++----- jjb/optf/optf-osdf.yaml | 72 +++++++++++++++++----------------- 6 files changed, 123 insertions(+), 121 deletions(-) diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 2e3df7d8c..b6defddad 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -7,39 +7,39 @@ - project: name: oparent - project-name: 'oparent' + project-name: "oparent" 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: 'oparent' + project: "oparent" stream: - - 'master': - branch: 'master' - - 'istanbul': - branch: 'istanbul' - mvn-settings: 'oparent-settings' + - "master": + branch: "master" + - "istanbul": + branch: "istanbul" + mvn-settings: "oparent-settings" java-version: openjdk11 - files: '**' - archive-artifacts: '' + files: "**" + archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g - project: name: oparent-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' + nexus-iq-namespace: "onap-" project: oparent - project-name: 'oparent' - branch: 'master' - mvn-settings: 'oparent-settings' + project-name: "oparent" + branch: "master" + mvn-settings: "oparent-settings" - project: name: oparent-info diff --git a/jjb/openci/openci-onap-daily-jobs.yaml b/jjb/openci/openci-onap-daily-jobs.yaml index 03b9be801..b8168c2cd 100644 --- a/jjb/openci/openci-onap-daily-jobs.yaml +++ b/jjb/openci/openci-onap-daily-jobs.yaml @@ -2,26 +2,26 @@ - project: name: openci-onap - project: '{name}' + project: "{name}" stream: - master: - branch: '{stream}' - gs-pathname: '' + branch: "{stream}" + gs-pathname: "" disabled: false jobs: - - 'openci-onap-autorelease-daily-{stream}' - - 'openci-onap-promote-daily-{stream}' + - "openci-onap-autorelease-daily-{stream}" + - "openci-onap-promote-daily-{stream}" # This job gets triggered manually for the demo purposes. # # In prototype, either what this job does needs to be integrated to # ONAP autorelease job or triggered by the upstream autorelease job. - job-template: - name: 'openci-onap-autorelease-daily-{stream}' + name: "openci-onap-autorelease-daily-{stream}" - disabled: '{obj:disabled}' + disabled: "{obj:disabled}" concurrent: false @@ -31,19 +31,19 @@ - string: name: PUBLISH_EVENT_TYPE default: ArtifactPublishedEvent - description: 'The type of the event this job publishes' + description: "The type of the event this job publishes" - string: name: PUBLISH_EVENT_ORIGIN default: ONAP - description: 'Originating community' + description: "Originating community" - string: name: ARTIFACT_LOCATION default: https://url/to/artifact/on/onap/nexus/$BUILD_NUMBER - description: 'The location of the artifact on ONAP Nexus' + description: "The location of the artifact on ONAP Nexus" - string: name: CONFIDENCE_LEVEL default: "'autorelease': 'SUCCESS'" - description: 'The confidence level the published artifact gained' + description: "The confidence level the published artifact gained" wrappers: - credentials-binding: @@ -56,8 +56,7 @@ builders: # this build step in the job executes create-ape.sh to construct the # ArtifactPublishedEvent (ape) and publish it using the python utility - - shell: - !include-raw-escape: ./create-ape.sh + - shell: !include-raw-escape: ./create-ape.sh # This job gets triggered by a ConfidenceLevelModifiedEvent published # by OPNFV jobs so ONAP can promote the autorelease artifact even further. @@ -65,9 +64,9 @@ # This job is created for the demo purposes and might not be there for # the prototype. - job-template: - name: 'openci-onap-promote-daily-{stream}' + name: "openci-onap-promote-daily-{stream}" - disabled: '{obj:disabled}' + disabled: "{obj:disabled}" concurrent: false @@ -76,6 +75,7 @@ triggers: - jms-messaging: provider-name: openci.activemq + # yamllint disable-line rule:line-length selector: JMSType = 'ConfidenceLevelModifiedEvent' and JMSOrigin = 'OPNFV' and JMSScenario = 'k8-nosdn-onap-ha' builders: diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml index 582680564..1536ab06e 100644 --- a/jjb/optf/optf-has-csit.yaml +++ b/jjb/optf/optf-has-csit.yaml @@ -1,17 +1,18 @@ +--- - project: name: optf-has-csit jobs: - - '{project-name}-review-verification-maven-{stream}': + - "{project-name}-review-verification-maven-{stream}": mvn-goals: clean install - - '{project-name}-merge-verification-maven-{stream}': + - "{project-name}-merge-verification-maven-{stream}": mvn-goals: clean install project-name: optf-has - recipients: 'snarayanan@research.att.com' + recipients: "snarayanan@research.att.com" project: optf/has stream: - - 'master': - branch: 'master' - - 'jakarta': - branch: 'jakarta' - mvn-settings: 'optf-has-settings' - robot-options: '' + - "master": + branch: "master" + - "jakarta": + branch: "jakarta" + mvn-settings: "optf-has-settings" + robot-options: "" diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index c3624ebfd..e06bfb58b 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -1,73 +1,73 @@ --- - project: name: optf-has - project-name: 'optf-has' - project: 'optf/has' + project-name: "optf-has" + project: "optf/has" stream: - - 'master': - branch: 'master' - - 'jakarta': - branch: 'jakarta' - mvn-settings: 'optf-has-settings' + - "master": + branch: "master" + - "jakarta": + branch: "jakarta" + mvn-settings: "optf-has-settings" subproject: - - 'conductor': - path: 'conductor' - pattern: 'conductor/**' - pom: 'pom.xml' + - "conductor": + path: "conductor" + pattern: "conductor/**" + pom: "pom.xml" jobs: - - '{project-name}-{stream}-{subproject}-verify-python': + - "{project-name}-{stream}-{subproject}-verify-python": build-node: ubuntu1804-builder-4c-4g - - '{project-name}-{stream}-{subproject}-merge-java': + - "{project-name}-{stream}-{subproject}-merge-java": build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sbom-generator: true sign-artifacts: true build-node: centos8-docker-8c-8g maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - gerrit-maven-docker-stage: sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - docker-pom: 'conductor/pom.xml' - mvn-params: '-Dmaven.test.skip=true -P docker' + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + docker-pom: "conductor/pom.xml" + mvn-params: "-Dmaven.test.skip=true -P docker" - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-builder-4c-4g' + files: "**" + archive-artifacts: "" + build-node: "ubuntu1804-builder-4c-4g" - project: name: optf-has-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: 'optf/has' - project-name: 'optf-has' - branch: 'master' - mvn-settings: 'optf-has-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "optf/has" + project-name: "optf-has" + branch: "master" + mvn-settings: "optf-has-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: optf-has-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' + nexus-iq-namespace: "onap-" project: optf/has - project-name: 'optf-has' + project-name: "optf-has" build-node: ubuntu1804-docker-8c-8g stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-has-settings' + - "master": + branch: "master" + mvn-settings: "optf-has-settings" - project: name: optf-has-info diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml index 708e3e10c..595c6d1d5 100644 --- a/jjb/optf/optf-osdf-csit.yaml +++ b/jjb/optf/optf-osdf-csit.yaml @@ -1,17 +1,18 @@ +--- - project: name: optf-osdf-csit jobs: - - '{project-name}-review-verification-maven-{stream}': + - "{project-name}-review-verification-maven-{stream}": mvn-goals: clean install - - '{project-name}-merge-verification-maven-{stream}': + - "{project-name}-merge-verification-maven-{stream}": mvn-goals: clean install project-name: optf-osdf - recipients: 'snarayanan@research.att.com' + recipients: "snarayanan@research.att.com" project: optf/osdf stream: - - 'master': - branch: 'master' - - 'jakarta': - branch: 'jakarta' - mvn-settings: 'optf-osdf-settings' - robot-options: '' + - "master": + branch: "master" + - "jakarta": + branch: "jakarta" + mvn-settings: "optf-osdf-settings" + robot-options: "" diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 8abff0d3a..0ed404cfb 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -1,74 +1,74 @@ --- - project: name: optf-osdf - project-name: 'optf-osdf' - project: 'optf/osdf' + project-name: "optf-osdf" + project: "optf/osdf" python-version: python3 stream: - - 'master': - branch: 'master' - - 'jakarta': - branch: 'jakarta' - mvn-settings: 'optf-osdf-settings' + - "master": + branch: "master" + - "jakarta": + branch: "jakarta" + mvn-settings: "optf-osdf-settings" subproject: - - 'osdf': - path: '.' - pattern: '**' - pom: 'pom.xml' + - "osdf": + path: "." + pattern: "**" + pom: "pom.xml" jobs: - - '{project-name}-{stream}-{subproject}-verify-python': + - "{project-name}-{stream}-{subproject}-verify-python": build-node: ubuntu1804-builder-4c-4g - - '{project-name}-{stream}-{subproject}-merge-java': + - "{project-name}-{stream}-{subproject}-merge-java": build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sbom-generator: true sign-artifacts: true build-node: centos8-docker-8c-8g maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': + - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - gerrit-maven-docker-stage: sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - docker-pom: 'pom.xml' - mvn-params: '-Dmaven.test.skip=true -P docker' + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + docker-pom: "pom.xml" + mvn-params: "-Dmaven.test.skip=true -P docker" - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-builder-4c-4g' + files: "**" + archive-artifacts: "" + build-node: "ubuntu1804-builder-4c-4g" - project: name: optf-osdf-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: 'optf/osdf' - project-name: 'optf-osdf' - branch: 'master' - mvn-settings: 'optf-osdf-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + project: "optf/osdf" + project-name: "optf-osdf" + branch: "master" + mvn-settings: "optf-osdf-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: optf-osdf-clm jobs: - gerrit-maven-clm - nexus-iq-namespace: 'onap-' + nexus-iq-namespace: "onap-" project: optf/osdf build-node: ubuntu1804-docker-8c-8g - project-name: 'optf-osdf' + project-name: "optf-osdf" stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-osdf-settings' + - "master": + branch: "master" + mvn-settings: "optf-osdf-settings" - project: name: optf-osdf-info -- 2.16.6