Fix yamllint for integration/distribution

Preparation for patch Icd1b8d4931e15b77ee29aa179422cd652e43f2e5

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

diff --git a/jjb/integration/distribution-jobs.yaml b/jjb/integration/distribution-jobs.yaml
index 25e878499c1c4c710db9c134844334baf1d445ed..16052698b97f28dbb9d276e0d7ce064c76068a61 100644 (file)
--- a/jjb/integration/distribution-jobs.yaml
+++ b/jjb/integration/distribution-jobs.yaml
@@ -1,26 +1,26 @@
-
+---
 - project:
     name: distribution-jobs
     jobs:
-        - '{project-name}-verify-python-{stream}'
-        - 'distribution-verify-{stream}'
-        - 'distribution-merge-{stream}'
-        - 'distribution-deploy-{stream}'
-        - 'distribution-offline-{stream}'
+      - '{project-name}-verify-python-{stream}'
+      - 'distribution-verify-{stream}'
+      - 'distribution-merge-{stream}'
+      - 'distribution-deploy-{stream}'
+      - 'distribution-offline-{stream}'
 
     project: integration/distribution
     project-name: distribution
 
     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'
 
 
 - job-template:
@@ -32,72 +32,75 @@
     jdk: '{jre}'
 
     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} **/dependency_tree.txt **/*.hprof'
-        - integration-patch-refspec:
-            branch: '$GERRIT_REFSPEC'
+      - opendaylight-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
+      - integration-patch-refspec:
+          branch: '$GERRIT_REFSPEC'
 
     scm:
-        - gerrit-trigger-scm:
-            refspec: '$PATCHREFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          refspec: '$PATCHREFSPEC'
+          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: '**'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
 
     prebuilders:
-        - integration-get-bundle-url-root
-        - inject:
-            properties-file: 'bundle.txt'
-        - wipe-org-opendaylight-repo
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: 'integration-settings'
+      - integration-get-bundle-url-root
+      - inject:
+          properties-file: 'bundle.txt'
+      - wipe-org-opendaylight-repo
+      - provide-maven-settings:
+          global-settings-file: 'odl-global-settings'
+          settings-file: 'integration-settings'
 
     maven:
-        maven-name: 'mvn33'
-        root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dstream={stream}'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: 'integration-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        ignore-upstream-changes: true
-        post-step-run-condition: 'SUCCESS'
+      maven-name: 'mvn33'
+      root-pom: 'pom.xml'
+      goals: >
+          clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
+          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          -Djenkins -Dstream={stream}
+      maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      settings: 'integration-settings'
+      settings-type: cfp
+      global-settings: 'odl-global-settings'
+      global-settings-type: cfp
+      ignore-upstream-changes: true
+      post-step-run-condition: 'SUCCESS'
 
     postbuilders:
-        - trigger-builds:
-            - project: 'distribution-deploy-{stream}'
-              block: true
-              predefined-parameters:
-                  BUNDLEURL=$BUNDLEURL
+      - trigger-builds:
+          - project: 'distribution-deploy-{stream}'
+            block: true
+            predefined-parameters:
+              BUNDLEURL=$BUNDLEURL
 
     reporters:
-        - findbugs
+      - findbugs
 
     publishers:
-        - jacoco-report
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[int/dist]'
+      - jacoco-report
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[int/dist]'
 
 
 - job-template:
@@ -113,73 +116,76 @@
     jdk: '{jre}'
 
     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} **/dependency_tree.txt **/*.hprof **/target/surefire-reports/*-output.txt'
-        - integration-bundleurl:
-            bundleurl: 'last'
+      - opendaylight-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof **/target/surefire-reports/*-output.txt'
+      - integration-bundleurl:
+          bundleurl: 'last'
     scm:
-        - gerrit-trigger-scm:
-            refspec: ''
-            choosing-strategy: 'default'
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-merged:
-            server-name: '{server-name}'
-            name: 'integration/distribution'
-            branch: '{branch}'
+      - gerrit-trigger-patch-merged:
+          server-name: '{server-name}'
+          name: 'integration/distribution'
+          branch: '{branch}'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - integration-get-bundle-vars
-        - inject:
-            properties-file: 'bundle_vars.txt'
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: 'integration-settings'
-        - distribute-build-url:
-            path: 'distribution-karaf/src/main/assembly'
+      - wipe-org-opendaylight-repo
+      - jacoco-nojava-workaround
+      - integration-get-bundle-vars
+      - inject:
+          properties-file: 'bundle_vars.txt'
+      - provide-maven-settings:
+          global-settings-file: 'odl-global-settings'
+          settings-file: 'integration-settings'
+      - distribute-build-url:
+          path: 'distribution-karaf/src/main/assembly'
 
     maven:
-        maven-name: 'mvn33'
-        root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dmerge -Dstream={stream}'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: 'integration-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
+      maven-name: 'mvn33'
+      root-pom: 'pom.xml'
+      goals: >
+          clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
+          -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+          -Djenkins -Dmerge -Dstream={stream}
+      maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      settings: 'integration-settings'
+      settings-type: cfp
+      global-settings: 'odl-global-settings'
+      global-settings-type: cfp
 
     postbuilders:
-        - conditional-step:
-            condition-kind: file-exists
-            condition-filename: deploy-site.xml
-            condition-basedir: workspace
-
-            # The strategy here is intentional to run Maven site:deploy twice
-            # once using regular pom.xml to produce a staged-site which is
-            # then used by deploy-site.xml to push to Nexus. This is a
-            # workaround to Maven Site's default linking code which creates
-            # incorrect URLs for sites due to auto-detection assuming your
-            # project is configured in a certain way which ODL is not.
-            steps:
+      - conditional-step:
+          condition-kind: file-exists
+          condition-filename: deploy-site.xml
+          condition-basedir: workspace
+
+          # The strategy here is intentional to run Maven site:deploy twice
+          # once using regular pom.xml to produce a staged-site which is
+          # then used by deploy-site.xml to push to Nexus. This is a
+          # workaround to Maven Site's default linking code which creates
+          # incorrect URLs for sites due to auto-detection assuming your
+          # project is configured in a certain way which ODL is not.
+          steps:
             - maven-target:
                 maven-version: 'mvn33'
                 pom: pom.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
-                    - '-Xmx2g'
+                  - '-Xmx2g'
                 settings: 'integration-settings'
                 settings-type: cfp
                 global-settings: 'odl-global-settings'
@@ -189,30 +195,30 @@
                 pom: deploy-site.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
-                    - '-Xmx2g'
+                  - '-Xmx2g'
                 settings: 'integration-settings'
                 settings-type: cfp
                 global-settings: 'odl-global-settings'
                 global-settings-type: cfp
-        - integration-compare-distributions
-        # TODO: the output of the above command is not *friendly* for the reader because the most important info
-        # is listed last. This is fine/best for command line output, but for keeping in a file it would be better
-        # to put the summary at the beginning of the file. Some bash magic can be done here to make that happen.
+      - integration-compare-distributions
+    # TODO: the output of the above command is not *friendly* for the reader because the most important info
+    # is listed last. This is fine/best for command line output, but for keeping in a file it would be better
+    # to put the summary at the beginning of the file. Some bash magic can be done here to make that happen.
 
     reporters:
-        - findbugs
+      - findbugs
 
     publishers:
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-        - jacoco-report
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[int/dist]'
+      - maven-deploy:
+          id: ''
+          unique-version: true
+          deploy-unstable: false
+      - jacoco-report
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[int/dist]'
 
 # Template: distribution-deploy-{stream}
 # Goal: Verify distribution starts with no issues when all features are loaded
@@ -226,42 +232,42 @@
     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} **/*.hprof'
-        - integration-distribution-branch:
-            branch: '{branch}'
-        - integration-bundleurl:
-            bundleurl: '{bundleurl}'
-        - integration-jdk-version:
-            jdkversion: '{jre}'
+      - opendaylight-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts} **/*.hprof'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-bundleurl:
+          bundleurl: '{bundleurl}'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * *'
+      - timed: 'H H * * *'
 
     builders:
-        - integration-get-bundle-vars
-        - inject:
-            properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller-verify
+      - integration-get-bundle-vars
+      - inject:
+          properties-file: 'bundle_vars.txt'
+      - integration-deploy-controller-verify
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[int/dist]'
-        - integration-csit-archive-build
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[int/dist]'
+      - integration-csit-archive-build
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 # Template: distribution-offline-{stream}
 # Goal: Verify distribution can start with no internet connection
@@ -274,39 +280,39 @@
     node: centos7-java-builder-2c-8g
 
     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} **/*.hprof'
-        - integration-distribution-branch:
-            branch: '{branch}'
-        - integration-bundleurl:
-            bundleurl: '{bundleurl}'
-        - integration-jdk-version:
-            jdkversion: '{jre}'
+      - opendaylight-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts} **/*.hprof'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-bundleurl:
+          bundleurl: '{bundleurl}'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * *'
+      - timed: 'H H * * *'
 
     builders:
-        - integration-get-bundle-vars
-        - inject:
-            properties-file: 'bundle_vars.txt'
-        - integration-deploy-controller-offline
+      - integration-get-bundle-vars
+      - inject:
+          properties-file: 'bundle_vars.txt'
+      - integration-deploy-controller-offline
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[int/dist]'
-        - integration-csit-archive-build
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[int/dist]'
+      - integration-csit-archive-build
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index 309986336997e9c6463f40e61af2652b256f9502..a6dcd2efd0161a42916a466b16e3f6f1e396d033 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: distribution-csit-userfeatures
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'distribution'
@@ -11,27 +12,27 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-            install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
-            robot-options: '-v USE_NETCONF_CONNECTOR:True'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-            install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
-            robot-options: '-v USE_NETCONF_CONNECTOR:True'
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
+          robot-options: '-v USE_NETCONF_CONNECTOR:True'
+      - beryllium:
+          branch: 'stable/beryllium'
+          jre: 'openjdk7'
+          install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
+          robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     # TODO: Add Beryllium when everything is backported there.
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: 'only'
+      - all:
+          scope: 'all'
 
     # Features to install
     install-features: 'odl-restconf,odl-distribution-version,odl-netconf-topology,odl-jolokia'

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index deed0abec2cf7cbaa1a75fbd3598aded1fab9abd..87112e490c4315fd96427b33ba2dd0c79fb82ae5 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -1,28 +1,29 @@
+---
 # ODL Releng build templates
 - project:
     name: distribution
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-sonar'
-        - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-sonar'
+      - '{project-name}-validate-autorelease-{stream}'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-        - boron:
-            branch: 'stable/boron'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-                - openjdk7
+      - carbon:
+          branch: 'master'
+          jdk: openjdk8
+          jdks:
+            - openjdk8
+      - boron:
+          branch: 'stable/boron'
+          jdk: openjdk8
+          jdks:
+            - openjdk8
+      - beryllium:
+          branch: 'stable/beryllium'
+          jdk: openjdk8
+          jdks:
+            - openjdk8
+            - openjdk7
 
     project: 'integration/distribution'
     project-name: 'distribution'