Merge "Fix yamllint for jsonrpc"

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index a74855eeefaf92c32346ae6f63048ecb8bf8f36e..5c670819831d8f96f6755292ecc7789a62bc7e70 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -63,6 +63,7 @@
 - job-template:
     name: builder-verify-jjb
     node: centos7-java-builder-2c-4g
+    concurrent: true
 
     project-type: freestyle
 
@@ -118,6 +119,7 @@
 - job-template:
     name: builder-verify-python
     node: centos7-java-builder-2c-4g
+    concurrent: true
 
     project-type: freestyle
 
@@ -438,7 +440,6 @@
     name: 'builder-merge-packer-{platforms}-{templates}'
     project-type: freestyle
     node: centos7-java-builder-2c-4g
-    concurrent: true
 
     properties:
         - opendaylight-infra-properties:

diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml
index 5c59cd0914426593f3acaa12a8a9beeb50a5223b..b6ba1610f44e1c3da64c7449b4956a2da3d9a44d 100644 (file)
--- a/jjb/yangtools/yangtools-csit-system.yaml
+++ b/jjb/yangtools/yangtools-csit-system.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: yangtools-csit-system
     jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'yangtools'
@@ -11,14 +12,14 @@
 
     # Project branches.
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        # The tested component was only introduced in Carbon.
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+      # The tested component was only introduced in Carbon.
 
     install:
-        - only:
-            scope: 'only'
+      - only:
+          scope: 'only'
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index cb35c40517374ea955c0165c5b3061c3fb4282f8..6dd2316fb132acd40d9640d8e5a142594f426eb7 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -1,12 +1,13 @@
+---
 - project:
     name: yangtools-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: 'yangtools'
@@ -14,10 +15,10 @@
     branch: 'master'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -28,12 +29,12 @@
 - project:
     name: yangtools-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: 'yangtools'
@@ -41,12 +42,12 @@
     branch: 'stable/boron'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn32:
-            mvn-version: 'mvn32'
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn32:
+          mvn-version: 'mvn32'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -57,12 +58,12 @@
 - project:
     name: yangtools-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: 'yangtools'
@@ -73,10 +74,10 @@
       - openjdk7
       - openjdk8
     maven:
-        - mvn32:
-            mvn-version: 'mvn32'
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn32:
+          mvn-version: 'mvn32'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -87,7 +88,7 @@
 - project:
     name: yangtools-sonar
     jobs:
-        - '{project-name}-sonar'
+      - '{project-name}-sonar'
 
     project: 'yangtools'
     project-name: 'yangtools'