Fix yamllint for netconf

Preparation for patch Icd1b8d4931e15b77ee29aa179422cd652e43f2e5

Change-Id: I00cd199d12f13101c2ede73fbcfc05816704a1bf
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
index c195e532d94f5df7f2bc4db57bf632d423a92121..c69ccd135bc95c667bf7ffafbdc00bca93e8446d 100644 (file)
--- 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 d8c1d4b0e41c72191e404461882fcbb87197a954..095e3a859b5a33a1f17e0f19599278c687fe1ff2 100644 (file)
--- 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 0f24660244501c70661866b3fabc29dfc833e36c..5432a6e9b8405df5468ade193811b50e171b11e8 100644 (file)
--- 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 3549a3bfcb1ca2089fd297786bb4bee9e3928733..53b5ebcd5ef16e45ebf6720d1f0613821d8fa460 100644 (file)
--- 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 bbf91ebc8eb02147138dfd2eaa9e04d44b752e2d..66bb266555163d261560a065a3cf4aad83c6fa92 100644 (file)
--- 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 468e00134de516b3686b641bcb8393d170440456..9ea3d0301a58d96a97cb98669b94a0f840df55a3 100644 (file)
--- 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'