From 71acdd474603eb01bdd166c7a9deedfdef7fde53 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Wed, 1 Mar 2017 13:33:54 -0500 Subject: [PATCH] Fix yamllint for netconf Preparation for patch Icd1b8d4931e15b77ee29aa179422cd652e43f2e5 Change-Id: I00cd199d12f13101c2ede73fbcfc05816704a1bf Signed-off-by: Thanh Ha --- jjb/netconf/netconf-cluster-stress.yaml | 29 +++++------ jjb/netconf/netconf-clustering-scale.yaml | 29 +++++------ jjb/netconf/netconf-clustering.yaml | 29 +++++------ jjb/netconf/netconf-scale.yaml | 53 ++++++++++++-------- jjb/netconf/netconf-userfeatures.yaml | 55 +++++++++++++-------- jjb/netconf/netconf.yaml | 59 ++++++++++++----------- 6 files changed, 144 insertions(+), 110 deletions(-) diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index c195e532d9..c69ccd135b 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -1,7 +1,8 @@ +--- - project: name: netconf-csit-cluster-stress jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - '{project}-csit-3node-{functionality}-{install}-{stream}' # The project name project: 'netconf' @@ -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 # odl-jolokia is added automatically just because this is a 3node job. diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index d8c1d4b0e4..095e3a859b 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -1,7 +1,8 @@ +--- - project: name: netconf-csit-clustering-scale jobs: - - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' + - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}' # The project name project: 'netconf' @@ -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-restconf,odl-netconf-clustered-topology' diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 0f24660244..5432a6e9b8 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -1,7 +1,8 @@ +--- - project: name: netconf-csit-clustering jobs: - - '{project}-csit-3node-{functionality}-{install}-{stream}' + - '{project}-csit-3node-{functionality}-{install}-{stream}' # The project name project: 'netconf' @@ -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-restconf,odl-netconf-clustered-topology' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 3549a3bfcb..53b5ebcd5e 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -1,7 +1,8 @@ +--- - project: name: netconf-csit-scale jobs: - - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' + - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}' # The project name project: 'netconf' @@ -11,28 +12,42 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-mdsal,odl-netconf-connector-all,odl-netconf-topology' - robot-options: '-v USE_NETCONF_CONNECTOR:True' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-mdsal,odl-netconf-connector-all,odl-netconf-topology' - robot-options: '-v USE_NETCONF_CONNECTOR:True' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + install-features: > + odl-restconf, + odl-clustering-test-app, + odl-netconf-mdsal, + odl-netconf-connector-all, + odl-netconf-topology + robot-options: '-v USE_NETCONF_CONNECTOR:True' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' + install-features: > + odl-restconf, + odl-clustering-test-app, + odl-netconf-mdsal, + odl-netconf-connector-all, + odl-netconf-topology + robot-options: '-v USE_NETCONF_CONNECTOR:True' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # Features to install - install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-mdsal,odl-netconf-topology' + install-features: > + odl-restconf, + odl-clustering-test-app, + odl-netconf-mdsal, + odl-netconf-topology # Robot custom options robot-options: '-v USE_NETCONF_CONNECTOR:False' diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index bbf91ebc8e..66bb266555 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -1,8 +1,9 @@ +--- - project: name: netconf-csit-userfeatures 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: 'netconf' @@ -12,28 +13,42 @@ # Project branches stream: - - carbon: - branch: 'master' - jre: 'openjdk8' - - boron: - branch: 'stable/boron' - jre: 'openjdk8' - install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-netconf-topology' - robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-netconf-topology' - robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True' + - carbon: + branch: 'master' + jre: 'openjdk8' + - boron: + branch: 'stable/boron' + jre: 'openjdk8' + install-features: > + odl-restconf, + odl-netconf-mdsal, + odl-clustering-test-app, + odl-netconf-connector-all, + odl-netconf-topology + robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' + install-features: > + odl-restconf, + odl-netconf-mdsal, + odl-clustering-test-app, + odl-netconf-connector-all, + odl-netconf-topology + robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True' install: - - only: - scope: 'only' - - all: - scope: 'all' + - only: + scope: 'only' + - all: + scope: 'all' # Features to install - install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-topology' + install-features: > + odl-restconf, + odl-netconf-mdsal, + odl-clustering-test-app, + odl-netconf-topology # Robot custom options robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:False' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 468e00134d..9ea3d0301a 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -1,12 +1,13 @@ +--- - project: name: netconf-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: 'netconf' @@ -14,10 +15,10 @@ branch: 'master' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'netconf-settings' mvn-goals: 'clean install -Pintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' @@ -28,12 +29,12 @@ - project: name: netconf-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: 'netconf' @@ -41,10 +42,10 @@ branch: 'stable/boron' jdk: openjdk8 jdks: - - openjdk8 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'netconf-settings' mvn-goals: 'clean install -Pintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' @@ -55,12 +56,12 @@ - project: name: netconf-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: 'netconf' @@ -68,11 +69,11 @@ branch: 'stable/beryllium' jdk: openjdk7 jdks: - - openjdk7 - - openjdk8 + - openjdk7 + - openjdk8 maven: - - mvn33: - mvn-version: 'mvn33' + - mvn33: + mvn-version: 'mvn33' mvn-settings: 'netconf-settings' mvn-goals: 'clean install -Pintegrationtests' mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' @@ -83,7 +84,7 @@ - project: name: netconf-sonar jobs: - - '{project-name}-sonar' + - '{project-name}-sonar' project: 'netconf' project-name: 'netconf' branch: 'master' -- 2.36.6