From 33efd2d4cd10d192847ba6c2735c66d969590dda Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 1 Mar 2017 13:21:56 -0500 Subject: [PATCH] Fix yamllint for l2switch Preparation for patch Icd1b8d4931e15b77ee29aa179422cd652e43f2e5 Change-Id: I1b2fc1288f75f784eca82dd2bdeb213cc6ee162f Signed-off-by: Thanh Ha --- .../l2switch-csit-host-scalability-daily.yaml | 25 +++--- jjb/l2switch/l2switch-csit-scalability.yaml | 29 +++---- jjb/l2switch/l2switch-csit-switch.yaml | 31 +++---- jjb/l2switch/l2switch-patch-test.yaml | 31 +++---- jjb/l2switch/l2switch.yaml | 80 +++++++++++-------- 5 files changed, 108 insertions(+), 88 deletions(-) diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index d0da62a6e3..7ce38594cc 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -1,7 +1,8 @@ +--- - project: name: l2switch-csit-host-scalability-daily jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' # The project name project: 'l2switch' @@ -11,19 +12,19 @@ # Project branches 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' install: - - only: - scope: 'only' + - only: + scope: 'only' # Features to install install-features: 'odl-l2switch-all,odl-l2switch-switch-rest' diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index e6da699f13..431bb7090a 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -1,7 +1,8 @@ +--- - project: name: l2switch-csit-scalability jobs: - - '{project}-csit-1node-{functionality}-{install}-{stream}' + - '{project}-csit-1node-{functionality}-{install}-{stream}' # The project name project: 'l2switch' @@ -11,21 +12,21 @@ # Project branches 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' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # Features to install install-features: 'odl-l2switch-switch-ui' diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index cc14b0a818..0b752da350 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -1,8 +1,9 @@ +--- - project: name: l2switch-csit-switch 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: 'l2switch' @@ -12,21 +13,21 @@ # Project branches 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' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # Features to install install-features: 'odl-l2switch-switch-ui' diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 3628b71206..52de3b90d0 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -1,26 +1,27 @@ +--- - project: name: l2switch-patch-test jobs: - - '{project}-patch-test-{feature}-{stream}' + - '{project}-patch-test-{feature}-{stream}' # The project name project: 'l2switch' # Project branches stream: - - carbon: - branch: 'master' - jdk: 'openjdk8' - - boron: - branch: 'stable/boron' - jdk: 'openjdk8' - - beryllium: - branch: 'stable/beryllium' - jdk: 'openjdk7' + - carbon: + branch: 'master' + jdk: 'openjdk8' + - boron: + branch: 'stable/boron' + jdk: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jdk: 'openjdk7' feature: - - all: - csit-list: > - l2switch-csit-1node-periodic-host-scalability-daily-only-{stream}, - l2switch-csit-1node-scalability-only-{stream}, - l2switch-csit-1node-switch-only-{stream} + - all: + csit-list: > + l2switch-csit-1node-periodic-host-scalability-daily-only-{stream}, + l2switch-csit-1node-scalability-only-{stream}, + l2switch-csit-1node-switch-only-{stream} diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 0daa6a4e56..22ab3dab82 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -1,12 +1,13 @@ +--- - project: name: l2switch-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: 'l2switch' @@ -14,26 +15,31 @@ branch: 'master' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'l2switch-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + openflowjava-merge-{stream}, + openflowplugin-merge-{stream} email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' archive-artifacts: '' - project: name: l2switch-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: 'l2switch' @@ -41,26 +47,31 @@ branch: 'stable/boron' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'l2switch-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + openflowjava-merge-{stream}, + openflowplugin-merge-{stream} email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' archive-artifacts: '' - project: name: l2switch-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: 'l2switch' @@ -68,22 +79,27 @@ branch: 'stable/beryllium' jdk: openjdk7 jdks: - - openjdk7 - - openjdk8 + - openjdk7 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'l2switch-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}' + dependencies: > + odlparent-merge-{stream}, + yangtools-merge-{stream}, + controller-merge-{stream}, + openflowjava-merge-{stream}, + openflowplugin-merge-{stream} email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' archive-artifacts: '' - project: name: l2switch-sonar jobs: - - '{project-name}-sonar' + - '{project-name}-sonar' project: 'l2switch' project-name: 'l2switch' branch: 'master' -- 2.36.6