Fix yamllint for sfc

Preparation for patch Icd1b8d4931e15b77ee29aa179422cd652e43f2e5

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

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 4a3f37131d2c0ef76cd0b512778104371d036771..711de2c31dc0549c538d9e51b5865a2431f34747 100644 (file)
--- a/jjb/sfc/sfc-csit-full-deploy.yaml
+++ b/jjb/sfc/sfc-csit-full-deploy.yaml
@@ -1,8 +1,8 @@
+---
 - project:
     name: sfc-csit-full-deploy
     jobs:
-        - '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
-
+      - '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'sfc'
@@ -12,18 +12,25 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: 'only'
+      - all:
+          scope: 'all'
 
     # Features to install
-    install-features: 'odl-sfc-provider,odl-sfc-ui,odl-sfc-openflow-renderer,odl-sfc-scf-openflow,odl-sfc-sb-rest,odl-sfc-ovs,odl-sfc-netconf'
+    install-features: >
+        odl-sfc-provider,
+        odl-sfc-ui,
+        odl-sfc-openflow-renderer,
+        odl-sfc-scf-openflow,
+        odl-sfc-sb-rest,
+        odl-sfc-ovs,
+        odl-sfc-netconf
 
     # Robot custom options
     robot-options: ''

diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml
index 8d60f9fcafd64c42e1077d5cd32c5048153adaaf..2833782c3c7019e19dc4ba93fa4b4b94650ddc88 100644 (file)
--- a/jjb/sfc/sfc-csit-rest-basic.yaml
+++ b/jjb/sfc/sfc-csit-rest-basic.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: sfc-csit-rest-basic
     jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
 
 
     # The project name
@@ -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-sfc-provider-rest'

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 7a3b3f87424c3c9060127f222337fb637831a35b..11d729d2a4ed7dd55eec5bf6fe87940279a6fccb 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -1,17 +1,18 @@
+---
 - project:
     name: sfc-python
     jobs:
-        - 'sfc-verify-python-{stream}'
+      - 'sfc-verify-python-{stream}'
 
     # stream:    release stream (eg. stable-boron or beryllium)
     # branch:    git branch (eg. stable/boron or master)
     stream:
-        - carbon:
-            branch: 'master'
-        - boron:
-            branch: 'stable/boron'
-        - beryllium:
-            branch: 'stable/beryllium'
+      - carbon:
+          branch: 'master'
+      - boron:
+          branch: 'stable/boron'
+      - beryllium:
+          branch: 'stable/beryllium'
 
     project: 'sfc'
 
@@ -31,43 +32,43 @@
     concurrent: true
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - gerrit-trigger-scm:
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            server: '{server-name}'
-            project: '{project}'
-            branch: '{branch}'
-            files: 'sfc-py/**'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: 'sfc-py/**'
 
     builders:
-        - shell: |
-            virtualenv $WORKSPACE/venv-tox
-            source $WORKSPACE/venv-tox/bin/activate
-            pip install tox argparse
-            tox --version
-            cd $WORKSPACE/sfc-py
-            tox
-            ./jenkins_build_package.sh
+      - shell: |
+          virtualenv $WORKSPACE/venv-tox
+          source $WORKSPACE/venv-tox/bin/activate
+          pip install tox argparse
+          tox --version
+          cd $WORKSPACE/sfc-py
+          tox
+          ./jenkins_build_package.sh
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[sfc]'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[sfc]'

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 3470a5516b60b00d3f2160f450f2ec14b094965a..0816d98e2a42738ce7fe05742257c51b0004f27e 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,12 +1,13 @@
+---
 - project:
     name: sfc-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: 'sfc'
@@ -14,10 +15,10 @@
     branch: 'master'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'sfc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -28,12 +29,12 @@
 - project:
     name: sfc-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: 'sfc'
@@ -41,10 +42,10 @@
     branch: 'stable/boron'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'sfc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -55,12 +56,12 @@
 - project:
     name: sfc-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: 'sfc'
@@ -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: 'sfc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -83,7 +84,7 @@
 - project:
     name: sfc-sonar
     jobs:
-        - '{project-name}-sonar'
+      - '{project-name}-sonar'
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'