From a5bf9b974cd7a4af5e4caffd32bdc1d8dce633ce Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Wed, 1 Mar 2017 16:30:08 -0800 Subject: [PATCH] Fix yamllint for vtn Change-Id: I56b0c3ee728638e76b067253e54c415f95aa6815 Signed-off-by: Jessica Wagantall --- jjb/vtn/vtn-csit-3node-manager.yaml | 25 ++++---- jjb/vtn/vtn-csit-coordinator.yaml | 31 +++++----- jjb/vtn/vtn-csit-manager.yaml | 33 ++++++----- jjb/vtn/vtn-manager-csit-1node-openstack.yaml | 51 ++++++++-------- jjb/vtn/vtn-patch-test.yaml | 27 +++++---- jjb/vtn/vtn.yaml | 59 ++++++++++--------- 6 files changed, 116 insertions(+), 110 deletions(-) diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml index 5991d76c3..b6864b656 100644 --- a/jjb/vtn/vtn-csit-3node-manager.yaml +++ b/jjb/vtn/vtn-csit-3node-manager.yaml @@ -1,8 +1,9 @@ +--- - project: name: vtn-csit-3node-manager jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' - - '{project}-csit-verify-3node-{functionality}' + - '{project}-csit-3node-{functionality}-{install}-{stream}' + - '{project}-csit-verify-3node-{functionality}' # The project name project: 'vtn' @@ -12,18 +13,18 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # Features to install install-features: 'odl-vtn-manager-rest,odl-vtn-manager-neutron' diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index 1676df8c1..033f82f50 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -1,8 +1,9 @@ +--- - project: name: vtn-csit-vtn-coordinator jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - '{project}-csit-verify-1node-{functionality}' + - '{project}-csit-1node-{functionality}-{install}-{stream}' + - '{project}-csit-verify-1node-{functionality}' # The project name project: 'vtn' @@ -12,21 +13,21 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300 - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300 - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300 + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + tools_system_image: Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300 + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' install: - - only: - scope: 'only' + - only: + scope: 'only' # Features to install install-features: 'odl-vtn-manager-rest' diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index 9ca51534f..b1e55ad5d 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -1,8 +1,9 @@ +--- - project: name: vtn-csit-manager jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' - - '{project}-csit-verify-1node-{functionality}' + - '{project}-csit-1node-{functionality}-{install}-{stream}' + - '{project}-csit-verify-1node-{functionality}' # The project name project: 'vtn' @@ -12,22 +13,22 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - tools_system_image: Ubuntu 14.04 - mininet - 20170210-0439 + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' + tools_system_image: Ubuntu 14.04 - mininet - 20170210-0439 install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # Features to install install-features: 'odl-vtn-manager-rest,odl-vtn-manager-neutron' diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml index c6e868d1d..78eb46f0a 100644 --- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml +++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml @@ -1,17 +1,18 @@ +--- - project: name: vtn-manager-csit-openstack-integration jobs: - - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' + - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' # The project name project: 'vtn' topology: - - 1node: - openstack_system_count: 1 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-vtn-manager-neutron,odl-restconf-all' + - 1node: + openstack_system_count: 1 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-vtn-manager-neutron,odl-restconf-all' testplan: '{project}-{topology}-openstack.txt' @@ -19,27 +20,27 @@ functionality: 'neutron' stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' openstack: - - mitaka: - openstack-branch: 'stable/mitaka' - odl-ml2-branch: 'stable/mitaka' - odl-ml2-driver-version: 'v1' - openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170210-1356' - - newton: - openstack-branch: 'stable/newton' - odl-ml2-branch: 'stable/newton' - odl-ml2-driver-version: 'v1' - openstack_system_image: 'CentOS 7 - devstack-newton - 20170210-1344' + - mitaka: + openstack-branch: 'stable/mitaka' + odl-ml2-branch: 'stable/mitaka' + odl-ml2-driver-version: 'v1' + openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170210-1356' + - newton: + openstack-branch: 'stable/newton' + odl-ml2-branch: 'stable/newton' + odl-ml2-driver-version: 'v1' + openstack_system_image: 'CentOS 7 - devstack-newton - 20170210-1344' schedule: '' diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml index 556f65c78..a19aaa85c 100644 --- a/jjb/vtn/vtn-patch-test.yaml +++ b/jjb/vtn/vtn-patch-test.yaml @@ -1,7 +1,8 @@ +--- - project: name: vtn-patch-test jobs: - - '{project}-patch-test-{feature}-{stream}' + - '{project}-patch-test-{feature}-{stream}' # The project name project: 'vtn' @@ -10,16 +11,16 @@ # Project branches stream: - - carbon: - branch: 'master' - jdk: 'openjdk8' - csit-list: > - vtn-csit-1node-manager-only-{stream}, - vtn-csit-3node-manager-only-{stream} + - carbon: + branch: 'master' + jdk: 'openjdk8' + csit-list: > + vtn-csit-1node-manager-only-{stream}, + vtn-csit-3node-manager-only-{stream} - - boron: - branch: 'stable/boron' - jdk: 'openjdk8' - csit-list: > - vtn-csit-1node-manager-only-{stream}, - vtn-csit-3node-manager-only-{stream} + - boron: + branch: 'stable/boron' + jdk: 'openjdk8' + csit-list: > + vtn-csit-1node-manager-only-{stream}, + vtn-csit-3node-manager-only-{stream} diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index a6954dc78..ce28ce30c 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -1,12 +1,13 @@ +--- - project: name: vtn-carbon jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: carbon project: 'vtn' @@ -14,10 +15,10 @@ branch: 'master' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'vtn-settings' mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -32,12 +33,12 @@ - project: name: vtn-boron jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: boron project: 'vtn' @@ -45,10 +46,10 @@ branch: 'stable/boron' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'vtn-settings' mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -63,12 +64,12 @@ - project: name: vtn-beryllium jobs: - - '{project-name}-clm-{stream}' - - '{project-name}-distribution-check-{stream}' - - '{project-name}-integration-{stream}' - - '{project-name}-merge-{stream}' - - '{project-name}-validate-autorelease-{stream}' - - '{project-name}-verify-{stream}-{maven}-{jdks}' + - '{project-name}-clm-{stream}' + - '{project-name}-distribution-check-{stream}' + - '{project-name}-integration-{stream}' + - '{project-name}-merge-{stream}' + - '{project-name}-validate-autorelease-{stream}' + - '{project-name}-verify-{stream}-{maven}-{jdks}' stream: beryllium project: 'vtn' @@ -76,11 +77,11 @@ branch: 'stable/beryllium' jdk: openjdk7 jdks: - - openjdk7 - - openjdk8 + - openjdk7 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'vtn-settings' mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -95,7 +96,7 @@ - project: name: vtn-sonar jobs: - - '{project-name}-sonar' + - '{project-name}-sonar' project: 'vtn' project-name: 'vtn' branch: 'master' -- 2.36.6