Merge "Modify OS syntax"

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index ea0e0a5..83306bc 100644 (file)
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: csit-hc2vpp
     description: 'jenkins jobs to verify Hc2vpp functional and performance tests.'
@@ -7,9 +8,9 @@
     project: 'csit'
     branch: 'master'
     build-artifact-num-to-keep: 10
-    os:
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
+    os: 'ubuntu1604'
+    repo-os-part: 'ubuntu.xenial.main'
+
     stream:
         - master:
             branch: 'master'

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 46446ee..d1e0cde 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: honeycomb
     jobs:
@@ -5,9 +6,9 @@
         - 'honeycomb-merge-{stream}-{os}'
         - 'honeycomb-benchmark-master'
     project: 'honeycomb'
-    os:
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
+    os: 'ubuntu1604'
+    repo-os-part: 'ubuntu.xenial.main'
+    
     stream:
         - master:
             branch: 'master'

diff --git a/jjb/puppet-fdio/puppet-fdio.yaml b/jjb/puppet-fdio/puppet-fdio.yaml
index fe7c2f5..b6a6a73 100644 (file)
--- a/jjb/puppet-fdio/puppet-fdio.yaml
+++ b/jjb/puppet-fdio/puppet-fdio.yaml
@@ -1,12 +1,13 @@
+---
 - project:
     name: puppet-fdio
     jobs:
         - 'puppet-module-unit'
         - 'puppet-fdio-verify-beaker-{stream}-{os}'
     project: 'puppet-fdio'
-    os:
-        - centos7:
-            repo-os-part: 'centos7'
+    os: 'centos7'
+    repo-os-part: 'centos7'
+
     stream:
         - master:
             branch: 'master'

diff --git a/jjb/vpp/vpp-opensuse.yaml b/jjb/vpp/vpp-opensuse.yaml
index 36e2c84..0107d83 100644 (file)
--- a/jjb/vpp/vpp-opensuse.yaml
+++ b/jjb/vpp/vpp-opensuse.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: opensuse423
     jobs:
@@ -5,9 +6,8 @@
         - 'vpp-merge-{stream}-opensuse'
 
     project: 'vpp'
-    os:
-      - opensuse:
-          repo-os-part: 'opensuse'
+    os: 'opensuse'
+    repo-os-part: 'opensuse'
 
     stream:
         - '1801':
@@ -24,9 +24,9 @@
         - 'vpp-merge-{stream}-osleap15'
 
     project: 'vpp'
-    os:
-      - opensuse:
-          repo-os-part: 'opensuse'
+    os: 'opensuse'
+    repo-os-part: 'opensuse'
+
     stream:
         - master:
             branch: 'master'