From aac4ab7bce1ebfc477825ba032c58008aaa23797 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 2 Mar 2017 11:00:12 +1000 Subject: [PATCH] Fix yamllint for ocpplugin Change-Id: I7b217ee32b6b36875c3385f9b2d23520fde2ad71 Signed-off-by: Anil Belur --- jjb/ocpplugin/ocpplugin-csit-basic.yaml | 25 ++++++------ jjb/ocpplugin/ocpplugin-csit-scalability.yaml | 25 ++++++------ jjb/ocpplugin/ocpplugin.yaml | 39 ++++++++++--------- 3 files changed, 46 insertions(+), 43 deletions(-) diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml index c27a07211..a0a5acdbb 100644 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml @@ -1,8 +1,9 @@ +--- - project: name: ocpplugin-csit-basic 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: 'ocpplugin' @@ -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-restconf,odl-l2switch-switch,odl-ocpplugin-all' diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml index f550aa505..300a8fb1f 100644 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml @@ -1,8 +1,9 @@ +--- - project: name: ocpplugin-csit-scalability 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: 'ocpplugin' @@ -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-restconf,odl-l2switch-switch,odl-ocpplugin-all' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 0a9aa7d91..c7e45b2ea 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -1,12 +1,13 @@ +--- - project: name: ocpplugin-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: 'ocpplugin' @@ -14,10 +15,10 @@ branch: 'master' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'ocpplugin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -28,12 +29,12 @@ - project: name: ocpplugin-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: 'ocpplugin' @@ -41,10 +42,10 @@ branch: 'stable/boron' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'ocpplugin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -55,7 +56,7 @@ - project: name: ocpplugin-sonar jobs: - - '{project-name}-sonar' + - '{project-name}-sonar' project: 'ocpplugin' project-name: 'ocpplugin' branch: 'master' -- 2.36.6