Merge "Fix yamllint for yangide"

[releng/builder.git] / jjb / neutron / neutron.yaml

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 59b8c8aea53049f21bbd68f30cdd66cfc0c3b210..c775346fb49060763eebb256ad629e4cf0b5144c 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,31 +1,25 @@
+---
 - project:
     name: neutron-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{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:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
     branch: 'master'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'neutron-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -36,30 +30,23 @@
 - project:
     name: neutron-boron
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{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:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron
     project: 'neutron'
     project-name: 'neutron'
     branch: 'stable/boron'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'neutron-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -70,27 +57,23 @@
 - project:
     name: neutron-beryllium
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{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: 'neutron'
     project-name: 'neutron'
     branch: 'stable/beryllium'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'neutron-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -101,7 +84,7 @@
 - project:
     name: neutron-sonar
     jobs:
-        - '{project-name}-sonar'
+      - '{project-name}-sonar'
     project: 'neutron'
     project-name: 'neutron'
     branch: 'master'