From: Trevor Bramwell Date: Wed, 23 Aug 2017 02:54:29 +0000 (-0700) Subject: Fix Yamllint Violations for jjb/ovn4nfv X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e2568dcf705060fb50cd1bc6874f44e7a30b8245;p=releng.git Fix Yamllint Violations for jjb/ovn4nfv JIRA: RELENG-254 Change-Id: If3c2d8b469c97997a3fdcbcaf4750acb61c82d75 Signed-off-by: Trevor Bramwell --- diff --git a/jjb/ovn4nfv/ovn4nfv-daily-jobs.yml b/jjb/ovn4nfv/ovn4nfv-daily-jobs.yml index ed6df41e3..a4c5865c0 100644 --- a/jjb/ovn4nfv/ovn4nfv-daily-jobs.yml +++ b/jjb/ovn4nfv/ovn4nfv-daily-jobs.yml @@ -1,22 +1,23 @@ +--- - project: name: 'ovn4nfv-daily-jobs' project: 'ovn4nfv' master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - disabled: false + stream: master + branch: '{stream}' + gs-pathname: '' + disabled: false pod: - - virtual: - slave-label: 'joid-virtual' - os-version: 'xenial' - <<: *master + - virtual: + slave-label: 'joid-virtual' + os-version: 'xenial' + <<: *master jobs: - - 'ovn4nfv-{pod}-daily-{stream}' + - 'ovn4nfv-{pod}-daily-{stream}' - job-template: name: 'ovn4nfv-{pod}-daily-{stream}' @@ -28,60 +29,59 @@ concurrent: false properties: - - logrotate-default - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - option: 'project' + - logrotate-default + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + option: 'project' scm: - - git-scm + - git-scm wrappers: - - ssh-agent-wrapper + - ssh-agent-wrapper - - timeout: - timeout: 240 - fail: true + - timeout: + timeout: 240 + fail: true triggers: - - timed: '@daily' + - timed: '@daily' parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - string: - name: DEPLOY_SCENARIO - default: os-ovn-nofeature-noha - - '{slave-label}-defaults' + - project-parameter: + project: '{project}' + branch: '{branch}' + - string: + name: DEPLOY_SCENARIO + default: os-ovn-nofeature-noha + - '{slave-label}-defaults' builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: deploy - condition: SUCCESSFUL - projects: - - name: 'joid-deploy-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO=os-ovn-nofeature-noha - COMPASS_OS_VERSION=xenial - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: functest - condition: SUCCESSFUL - projects: - - name: 'functest-joid-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO=os-ovn-nofeature-ha - FUNCTEST_SUITE_NAME=ovn4nfv_test_suite - node-parameters: true - kill-phase-on: NEVER - abort-all-job: true - + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: deploy + condition: SUCCESSFUL + projects: + - name: 'joid-deploy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=os-ovn-nofeature-noha + COMPASS_OS_VERSION=xenial + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: functest + condition: SUCCESSFUL + projects: + - name: 'functest-joid-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=os-ovn-nofeature-ha + FUNCTEST_SUITE_NAME=ovn4nfv_test_suite + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true diff --git a/jjb/ovn4nfv/ovn4nfv-project-jobs.yml b/jjb/ovn4nfv/ovn4nfv-project-jobs.yml index 805aa04a6..8c82cac5e 100644 --- a/jjb/ovn4nfv/ovn4nfv-project-jobs.yml +++ b/jjb/ovn4nfv/ovn4nfv-project-jobs.yml @@ -1,3 +1,4 @@ +--- - project: name: ovn4nfv @@ -5,13 +6,13 @@ stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false jobs: - - 'ovn4nfv-build-{stream}' + - 'ovn4nfv-build-{stream}' - job-template: name: 'ovn4nfv-build-{stream}' @@ -21,31 +22,31 @@ disabled: '{obj:disabled}' properties: - - logrotate-default - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - option: 'project' + - logrotate-default + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + option: 'project' parametert: - - project-parameter: - project: '{project}' - branch: '{branch}' + - project-parameter: + project: '{project}' + branch: '{branch}' scm: - - git-scm + - git-scm triggers: - - timed: 'H 23 * * *' + - timed: 'H 23 * * *' builders: - - 'ovn4nfv-build-macro' + - 'ovn4nfv-build-macro' - builder: name: 'ovn4nfv-build-macro' builders: - - shell: | - #!/bin/bash + - shell: | + #!/bin/bash - echo "hello world" + echo "hello world"