From 81e724678beed8dca225970663f03eca0609d918 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Wed, 1 Mar 2017 16:56:32 -0800 Subject: [PATCH] Fix yamllint for usecplugin Change-Id: Ib78f1b74f1b35c1ea1cd6960a6b4773a2011421a Signed-off-by: Jessica Wagantall --- jjb/usecplugin/usecplugin-csit-basic.yaml | 31 ++++++------ jjb/usecplugin/usecplugin.yaml | 57 ++++++++++++----------- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index e902519fb..9e9225830 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -1,8 +1,9 @@ +--- - project: name: usecplugin-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: 'usecplugin' @@ -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-restconf,odl-usecplugin-aaa,odl-usecplugin-openflow' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index f9cf80a55..8b13afb20 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -1,12 +1,13 @@ +--- - project: name: usecplugin-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: 'usecplugin' @@ -14,10 +15,10 @@ branch: 'master' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'usecplugin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -28,12 +29,12 @@ - project: name: usecplugin-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: 'usecplugin' @@ -41,10 +42,10 @@ branch: 'stable/boron' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'usecplugin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -55,12 +56,12 @@ - project: name: usecplugin-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: 'usecplugin' @@ -68,11 +69,11 @@ branch: 'stable/beryllium' jdk: openjdk7 jdks: - - openjdk7 + - openjdk7 - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'usecplugin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -83,7 +84,7 @@ - project: name: usecplugin-sonar jobs: - - '{project-name}-sonar' + - '{project-name}-sonar' project: 'usecplugin' project-name: 'usecplugin' -- 2.36.6