From: Andrew Grimberg Date: Wed, 3 May 2023 15:52:49 +0000 (-0700) Subject: Refactor: Cleanup for pre-commit X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c99efd9150bd4141509dd8fd3503a2b69bee8281;p=ci-management.git Refactor: Cleanup for pre-commit Change-Id: Iadd1156df936632fc674ad1353d0b807bdf66d70 Issue-ID: CIMAN-33 Signed-off-by: Andrew Grimberg --- diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml index 0df13c59e..103c47218 100644 --- a/jjb/vnfrqts/build-and-upload.yaml +++ b/jjb/vnfrqts/build-and-upload.yaml @@ -4,12 +4,12 @@ # upload it to nexus as RAW artifacts. # - name: '{project-name}-{stream}-build-and-upload' + name: "{project-name}-{stream}-build-and-upload" - pre_script: '' - post_script: '' - artifact_name: '' - project_id: '' + pre_script: "" + post_script: "" + artifact_name: "" + project_id: "" project-type: freestyle concurrent: true @@ -17,52 +17,52 @@ properties: - infra-properties: - build-days-to-keep: '{build-days-to-keep}' + build-days-to-keep: "{build-days-to-keep}" parameters: - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + project: "{project}" + branch: "{branch}" + refspec: "refs/heads/{branch}" + artifacts: "{archive-artifacts}" scm: - git: - credentials-id: '{jenkins-ssh-credential}' - url: '$GIT_BASE' - refspec: '' - choosing-strategy: 'default' + credentials-id: "{jenkins-ssh-credential}" + url: "$GIT_BASE" + refspec: "" + choosing-strategy: "default" branches: - - 'refs/heads/{branch}' + - "refs/heads/{branch}" skip-tag: true wipe-workspace: true submodule: - recursive: '{submodule-recursive}' - timeout: '24' + recursive: "{submodule-recursive}" + timeout: "24" wrappers: - infra-wrappers: - build-timeout: '{build-timeout}' + build-timeout: "{build-timeout}" triggers: - - timed: 'H H * * *' + - timed: "H H * * *" - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' + server: "{server-name}" + project: "{project}" + branch: "{branch}" builders: - lf-provide-maven-settings: - global-settings-file: '{mvn-global-settings}' - settings-file: '{mvn-settings}' - - shell: '{obj:pre_script}' + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" + - shell: "{obj:pre_script}" - lf-infra-create-netrc: server-id: ecomp-raw - inject: properties-content: | ARTIFACT_NAME={artifact_name} PROJECT_ID={project_id} - - shell: '{obj:post_script}' + - shell: "{obj:post_script}" - lf-provide-maven-settings-cleanup publishers: diff --git a/jjb/vnfrqts/vnfrqts-epics.yaml b/jjb/vnfrqts/vnfrqts-epics.yaml index e86a69172..8859c1660 100644 --- a/jjb/vnfrqts/vnfrqts-epics.yaml +++ b/jjb/vnfrqts/vnfrqts-epics.yaml @@ -7,10 +7,10 @@ - project: name: vnfrqts-epics - project: 'vnfrqts/epics' + project: "vnfrqts/epics" jobs: - gerrit-info-yaml-verify build-node: centos8-builder-2c-1g - project-name: 'vnfrqts-epics' - branch: 'master' - mvn-settings: 'vnfrqts-epics-settings' + project-name: "vnfrqts-epics" + branch: "master" + mvn-settings: "vnfrqts-epics-settings" diff --git a/jjb/vnfrqts/vnfrqts-guidelines.yaml b/jjb/vnfrqts/vnfrqts-guidelines.yaml index 6517277f5..2615f4ff1 100644 --- a/jjb/vnfrqts/vnfrqts-guidelines.yaml +++ b/jjb/vnfrqts/vnfrqts-guidelines.yaml @@ -1,10 +1,10 @@ --- - project: name: vnfrqts-guidelines - project: 'vnfrqts/guidelines' + project: "vnfrqts/guidelines" jobs: - gerrit-info-yaml-verify build-node: centos8-builder-2c-1g - project-name: 'vnfrqts-guidelines' - branch: 'master' - mvn-settings: 'vnfrqts-guidelines-settings' + project-name: "vnfrqts-guidelines" + branch: "master" + mvn-settings: "vnfrqts-guidelines-settings" diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml index a8fd39cc2..ce4720f27 100644 --- a/jjb/vnfrqts/vnfrqts-requirements.yaml +++ b/jjb/vnfrqts/vnfrqts-requirements.yaml @@ -1,25 +1,25 @@ --- - project: name: vnfrqts-requirements - project: 'vnfrqts/requirements' + project: "vnfrqts/requirements" jobs: - gerrit-info-yaml-verify build-node: centos8-builder-2c-1g - project-name: 'vnfrqts-requirements' - branch: 'master' - mvn-settings: 'vnfrqts-requirements-settings' + project-name: "vnfrqts-requirements" + branch: "master" + mvn-settings: "vnfrqts-requirements-settings" - project: name: vnfrqts-requirements-upload-json - project: 'vnfrqts/requirements' - project-name: 'vnfrqts-requirements' - mvn-settings: 'vnfrqts-requirements-settings' - mvn-global-settings: 'global-settings' + project: "vnfrqts/requirements" + project-name: "vnfrqts-requirements" + mvn-settings: "vnfrqts-requirements-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-needs.sh artifact_name: needs.json project_id: org.onap.vnfrqts.requirements diff --git a/jjb/vnfrqts/vnfrqts-testcases.yaml b/jjb/vnfrqts/vnfrqts-testcases.yaml index 13dcfe8cf..d094a86c7 100644 --- a/jjb/vnfrqts/vnfrqts-testcases.yaml +++ b/jjb/vnfrqts/vnfrqts-testcases.yaml @@ -1,10 +1,10 @@ --- - project: name: vnfrqts-testcases - project: 'vnfrqts/testcases' + project: "vnfrqts/testcases" jobs: - gerrit-info-yaml-verify build-node: centos8-builder-2c-1g - project-name: 'vnfrqts-testcases' - branch: 'master' - mvn-settings: 'vnfrqts-testcases-settings' + project-name: "vnfrqts-testcases" + branch: "master" + mvn-settings: "vnfrqts-testcases-settings" diff --git a/jjb/vnfrqts/vnfrqts-usecases.yaml b/jjb/vnfrqts/vnfrqts-usecases.yaml index 8d964c6f7..61c8be77c 100644 --- a/jjb/vnfrqts/vnfrqts-usecases.yaml +++ b/jjb/vnfrqts/vnfrqts-usecases.yaml @@ -1,10 +1,10 @@ --- - project: name: vnfrqts-usecases - project: 'vnfrqts/usecases' + project: "vnfrqts/usecases" jobs: - gerrit-info-yaml-verify build-node: centos8-builder-2c-1g - project-name: 'vnfrqts-usecases' - branch: 'master' - mvn-settings: 'vnfrqts-usecases-settings' + project-name: "vnfrqts-usecases" + branch: "master" + mvn-settings: "vnfrqts-usecases-settings"