From: Vanessa Rene Valderrama Date: Thu, 11 Oct 2018 20:02:39 +0000 (+0000) Subject: Merge "Fix RPM_DPDK linting" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=eee286749177282b838ccf24e1fb83c27c40d56e;hp=052de3c10a9ced2d7c37da4a630271d9087770fe;p=ci-management.git Merge "Fix RPM_DPDK linting" --- diff --git a/jjb/rpm_dpdk/rpm_dpdk.yaml b/jjb/rpm_dpdk/rpm_dpdk.yaml index 6ccb73722..0700c7a91 100644 --- a/jjb/rpm_dpdk/rpm_dpdk.yaml +++ b/jjb/rpm_dpdk/rpm_dpdk.yaml @@ -1,18 +1,19 @@ +--- - project: name: rpm_dpdk jobs: - - 'rpm_dpdk-verify-{stream}-{os}' - - 'rpm_dpdk-merge-{stream}-{os}' - - 'rpm_dpdk-verify-image-{stream}-{os}' + - 'rpm_dpdk-verify-{stream}-{os}' + - 'rpm_dpdk-merge-{stream}-{os}' + - 'rpm_dpdk-verify-image-{stream}-{os}' project: 'rpm_dpdk' os: - - centos7: - repo-os-part: 'centos7' + - centos7: + repo-os-part: 'centos7' stream: - - master: - branch: 'master' - repo-stream-part: 'master' + - master: + branch: 'master' + repo-stream-part: 'master' - job-template: name: 'rpm_dpdk-verify-{stream}-{os}' @@ -22,40 +23,40 @@ concurrent: true build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - os-parameter: - os: '{os}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: - name: '{project}' - branch: '{branch}' + - gerrit-trigger-patch-submitted: + name: '{project}' + branch: '{branch}' builders: - - shell: - !include-raw-escape: - - include-raw-rpm_dpdk-pkg-build.sh + - shell: + !include-raw-escape: + - include-raw-rpm_dpdk-pkg-build.sh publishers: - fdio-infra-shiplogs: @@ -69,53 +70,54 @@ concurrent: true build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - os-parameter: - os: '{os}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'verify-images' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'verify-images' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true builders: - - shell: - !include-raw-escape: - - include-raw-rpm_dpdk-pkg-build.sh + - shell: + !include-raw-escape: + - include-raw-rpm_dpdk-pkg-build.sh + publishers: - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -127,57 +129,57 @@ node: '{os}-basebuild-4c-4g' build-discarder: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - os-parameter: - os: '{os}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' - - maven-exec: - maven-version: 'mvn33-new' + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' + - maven-exec: + maven-version: 'mvn33-new' scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - choosing-strategy: 'default' + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-merged: - name: '{project}' - branch: '{branch}' + - gerrit-trigger-patch-merged: + name: '{project}' + branch: '{branch}' builders: - - maven-target: - maven-version: 'mvn33-new' - goals: '--version' - settings: 'rpm_dpdk-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - config-file-provider: - files: - - file-id: 'rpm_dpdk-settings' - variable: 'SETTINGS_FILE' - - file-id: 'global-settings' - variable: 'GLOBAL_SETTINGS_FILE' - - shell: - !include-raw-escape: - - ../scripts/maven_push_functions.sh - - include-raw-rpm_dpdk-pkg-build.sh - - include-raw-rpm_dpdk-pkg-push.sh + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'rpm_dpdk-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - config-file-provider: + files: + - file-id: 'rpm_dpdk-settings' + variable: 'SETTINGS_FILE' + - file-id: 'global-settings' + variable: 'GLOBAL_SETTINGS_FILE' + - shell: + !include-raw-escape: + - ../scripts/maven_push_functions.sh + - include-raw-rpm_dpdk-pkg-build.sh + - include-raw-rpm_dpdk-pkg-push.sh publishers: - fdio-infra-shiplogs: