From fc6c23b753822dd141d704ea26d8e130f81dba66 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 6 Dec 2016 19:37:16 +0100
Subject: [PATCH] Switch to Xenial: zaqar

Convert zaqar jobs to xenial. Newton and newer will run on xenial,
older branches on trusty.

Let the gate-dsvm-*zaqar run only on trusty and the newer
functional/tempest ones on xenial - following the intention of the
comments.

Mark the gate-dsvm-*zaqar as -nv instead of using special condition to
make them non-voting.

Change-Id: I8654dbcf02d0c8cf5cc91d993bc9a35010d5758a
---
 jenkins/jobs/projects.yaml | 16 ++++++++--------
 jenkins/jobs/zaqar.yaml    |  4 ++--
 zuul/layout.yaml           | 25 +++++++------------------
 3 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index fda5be3831..b03394887c 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -16101,27 +16101,27 @@
             - ubuntu-trusty
             - ubuntu-xenial
           job-suffix: '-nv'
-      - '{pipeline}-dsvm-{backend}-zaqar{job-suffix}':
+      - '{pipeline}-dsvm-{backend}-zaqar-{node}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
-          job-suffix: ''
+          job-suffix: '-nv'
           branch-override: default
           backend: mongodb
-      - '{pipeline}-dsvm-{backend}-zaqar{job-suffix}':
+      - '{pipeline}-dsvm-{backend}-zaqar-{node}{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty
-          job-suffix: ''
+          job-suffix: '-nv'
           branch-override: default
           backend: redis
-      - '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}':
+      - '{pipeline}-tempest-dsvm-{backend}-zaqar-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node: ubuntu-xenial
           job-suffix: ''
           branch-override: default
           backend: mongodb
-      - '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}':
+      - '{pipeline}-tempest-dsvm-{backend}-zaqar-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node: ubuntu-xenial
           job-suffix: ''
           branch-override: default
           backend: redis
diff --git a/jenkins/jobs/zaqar.yaml b/jenkins/jobs/zaqar.yaml
index dd100b51ce..96111b6a02 100644
--- a/jenkins/jobs/zaqar.yaml
+++ b/jenkins/jobs/zaqar.yaml
@@ -47,7 +47,7 @@
 
 
 - job-template:
-    name: '{pipeline}-dsvm-{backend}-zaqar{job-suffix}'
+    name: '{pipeline}-dsvm-{backend}-zaqar-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -91,7 +91,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-{backend}-zaqar-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5229adcab3..61bf0469cb 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1845,17 +1845,6 @@ jobs:
   - name: gate-rally-dsvm-verify-light-create-resources
     voting: false
 
-  # NOTE(wangxiyuan) As the tempest test has been enabled and the functional
-  # test may cause the interdependent issue, this check is unnecessary now. So
-  # switch the zaqar client functional test to non-voting.
-  - name: ^gate-dsvm-.*-zaqar$
-    voting: false
-
-  # NOTE(wangxiyuan) tempest test for zaqar was introduced in the newton cycle,
-  # so testing the earlier branches doesn't make sense.
-  - name: ^gate-tempest-dsvm-.*-zaqar$
-    branch: ^(?!stable/(liberty|mitaka)).*$
-
   # NOTE(aweyl) tempest test for vitrage was introduced in the mitaka cycle,
   # so testing the earlier branches doesn't make sense.
   - name: ^gate-vitrage-dsvm-datasources-ubuntu-trusty$
@@ -3575,7 +3564,7 @@ projects:
       - gate-tempest-dsvm-neutron-placement-full-ubuntu-xenial-nv
       - gate-tempest-dsvm-cells-ubuntu-trusty
       - gate-tempest-dsvm-cells-ubuntu-xenial
-      - gate-dsvm-mongodb-zaqar
+      - gate-dsvm-mongodb-zaqar-ubuntu-trusty-nv
       - gate-grenade-dsvm-forward
       - gate-tempest-dsvm-lvm-multibackend-ubuntu-xenial
     periodic:
@@ -18288,17 +18277,17 @@ projects:
     check:
       - gate-zaqar-tox-integration-ubuntu-trusty
       - gate-zaqar-tox-integration-ubuntu-xenial
-      - gate-dsvm-mongodb-zaqar
-      - gate-dsvm-redis-zaqar
+      - gate-dsvm-mongodb-zaqar-ubuntu-trusty-nv
+      - gate-dsvm-redis-zaqar-ubuntu-trusty-nv
       - gate-rally-dsvm-zaqar-zaqar-ubuntu-trusty-nv
       - gate-rally-dsvm-zaqar-zaqar-ubuntu-xenial-nv
-      - gate-tempest-dsvm-mongodb-zaqar
-      - gate-tempest-dsvm-redis-zaqar
+      - gate-tempest-dsvm-mongodb-zaqar-ubuntu-xenial
+      - gate-tempest-dsvm-redis-zaqar-ubuntu-xenial
     gate:
       - gate-zaqar-tox-integration-ubuntu-trusty
       - gate-zaqar-tox-integration-ubuntu-xenial
-      - gate-tempest-dsvm-mongodb-zaqar
-      - gate-tempest-dsvm-redis-zaqar
+      - gate-tempest-dsvm-mongodb-zaqar-ubuntu-xenial
+      - gate-tempest-dsvm-redis-zaqar-ubuntu-xenial
 
   - name: openstack/zaqar-specs
     template: