Merge "Don't use lists for single nodes"

jenkins/jobs/deb-build-pkg.yaml

@@ -53,8 +53,6 @@
     name: 'debian-pkg-build'
     jobs:
       - 'gate-{name}-dpkg-{node}':
-          node:
+          node: debian-jessie
-            - debian-jessie
       - '{name}-dpkg-{node}':
-          node:
+          node: debian-jessie
-            - debian-jessie

jenkins/jobs/golang-jobs.yaml

@@ -38,8 +38,7 @@
 
 - job-group:
     name: golang-jobs
-    node:
+    node: ubuntu-xenial
-      - ubuntu-xenial
     jobs:
       - 'gate-{name}-fmt-{node}'
       - 'gate-{name}-unit-{node}'

jenkins/jobs/projects.yaml

@@ -6332,20 +6332,17 @@
           pipeline: 'gate'
           suffix: ''
       - '{pipeline}-grenade-dsvm-manila-{node}{suffix}':
-          node:
+          node: ubuntu-xenial
-            - 'ubuntu-xenial'
           pipeline: 'gate'
           branch-override: default
           suffix: '-nv'
       - 'gate-manila-tempest-minimal-dsvm-{driver}-{node}{suffix}':
-          node:
+          node: ubuntu-trusty
-            - 'ubuntu-trusty'
           driver:
             - 'lvm'
           suffix: ''
       - 'gate-manila-tempest-minimal-dsvm-{driver}-{node}{suffix}':
-          node:
+          node: ubuntu-xenial
-            - 'ubuntu-xenial'
           driver:
             - 'dummy'
             - 'lvm'
@@ -6372,8 +6369,7 @@
           test_type: 'api'
           suffix: '-nv'
       - 'gate-manila-tempest-dsvm-{description}-{node}{suffix}':
-          node:
+          node: ubuntu-trusty
-            - 'ubuntu-trusty'
           description: mysql-generic
           postgres_enabled: '0'
           dhss: '1'
@@ -6382,8 +6378,7 @@
           test_type: 'api'
           suffix: ''
       - 'gate-manila-tempest-dsvm-{description}-{node}{suffix}':
-          node:
+          node: ubuntu-xenial
-            - 'ubuntu-xenial'
           description: mysql-generic
           postgres_enabled: '0'
           dhss: '1'
@@ -6403,8 +6398,7 @@
           test_type: 'api'
           suffix: '-nv'
       - 'gate-manila-tempest-dsvm-{description}-{node}{suffix}':
-          node:
+          node: ubuntu-xenial
-            - 'ubuntu-xenial'
           description: postgres-container
           postgres_enabled: '1'
           dhss: '1'

jenkins/jobs/puppet-module-jobs.yaml

@@ -386,32 +386,28 @@
       - 4.5
       - 'latest'
     puppet_unit_version: '3.3 3.4 3.6 3.7 3.8 4.0 4.5 latest'
-    node:
+    node: centos-7
-      - centos-7
     jobs:
       - 'gate-{name}-puppet-unit-{puppet_version}-{node}'
 
 - job-group:
     name: 'puppet-beaker-jobs-trusty'
     ostype: trusty
-    node:
+    node: ubuntu-trusty
-      - ubuntu-trusty
     jobs:
       - 'gate-{name}-puppet-beaker-rspec-{node}{suffix}'
 
 - job-group:
     name: 'puppet-beaker-jobs-xenial'
     ostype: xenial
-    node:
+    node: ubuntu-xenial
-      - ubuntu-xenial
     jobs:
       - 'gate-{name}-puppet-beaker-rspec-{node}{suffix}'
 
 - job-group:
     name: 'puppet-beaker-jobs-centos7'
     ostype: centos7
-    node:
+    node: centos-7
-      - centos-7
     jobs:
       - 'gate-{name}-puppet-beaker-rspec-{node}{suffix}'
 

jenkins/jobs/python-jobs.yaml

@@ -786,8 +786,7 @@
 
 - job-group:
     name: cross-python-jobs
-    node:
+    node: ubuntu-xenial
-      - ubuntu-xenial
     jobs:
       - 'gate-cross-{name}-python27-{node}'
 
@@ -815,8 +814,7 @@
 
 - job-group:
     name: cross-python-db-jobs
-    node:
+    node: ubuntu-xenial
-      - ubuntu-xenial
     jobs:
       - 'gate-cross-{name}-python27-db-{node}'
 

jenkins/jobs/snap-jobs.yaml

@@ -1,7 +1,6 @@
 - job-group:
     name: snap-jobs
-    node:
+    node: ubuntu-xenial
-      - ubuntu-xenial
     jobs:
       - 'gate-{name}-tox-with-sudo-{envlist}':
           envlist: snap

jenkins/jobs/specs-jobs.yaml

@@ -31,8 +31,7 @@
 
 - job-group:
     name: specs-jobs
-    node:
+    node: ubuntu-xenial
-      - ubuntu-xenial
     jobs:
       - gate-{name}-docs-{node}:
       - gate-{name}-python27-{node}:

jenkins/jobs/tripleo.yaml

@@ -225,19 +225,15 @@
     jobs:
       - '{pipeline}-tripleo-quickstart-{scenario}-{node}{suffix}':
           suffix: '-nv'
-          node:
+          node: centos-7
-            - centos-7
           pipeline: gate
-          scenario:
+          scenario: base
-            - base
 
 - job-group:
     name: 'tripleo-quickstart-extras-jobs'
     jobs:
       - '{pipeline}-tripleo-quickstart-extras-{scenario}-{node}{suffix}':
           suffix: '-nv'
-          node:
+          node: centos-7
-            - centos-7
           pipeline: gate
-          scenario:
+          scenario: base
-            - base