commit 9522a7e644ebe0f0300cc0dea3eab42d1f924d7b
author Hongbin Lu <hongbin.lu@huawei.com> Wed Apr 18 19:18:43 2018 +0000
committer Hongbin Lu <hongbin.lu@huawei.com> Fri Apr 20 23:06:10 2018 +0000
tree fae4aedd5f592dfaffba78717c6154776878742d
parent 7b410edc39745d94359ebccc0be0c4903fa659ae

Add stable jobs to the gate

Since neutron-tempest-plugin is branchless, it is necessary to gate
againest all stable branches to avoid breakage in stable branches.

Related-Bug: #1765008
Change-Id: Ib175678c0a655568054a4c2d595b890ff85e00ec

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index a002690..636327e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -103,6 +103,13 @@
       - ^tox.ini$
 
 - job:
+    name: neutron-tempest-plugin-api-queens
+    parent: neutron-tempest-plugin-api
+    override-checkout: stable/queens
+    vars:
+      branch_override: stable/queens
+
+- job:
     name: neutron-tempest-plugin-scenario-linuxbridge
     parent: neutron-tempest-plugin-scenario
     timeout: 10000
@@ -119,6 +126,13 @@
               debug_iptables_rules: true
 
 - job:
+    name: neutron-tempest-plugin-scenario-linuxbridge-queens
+    parent: neutron-tempest-plugin-scenario-linuxbridge
+    override-checkout: stable/queens
+    vars:
+      branch_override: stable/queens
+
+- job:
     name: neutron-tempest-plugin-dvr-multinode-scenario
     parent: legacy-dsvm-base-multinode
     run: playbooks/neutron-tempest-plugin-dvr-multinode-scenario/run.yaml
@@ -143,6 +157,13 @@
     voting: false
 
 - job:
+    name: neutron-tempest-plugin-dvr-multinode-scenario-queens
+    parent: neutron-tempest-plugin-dvr-multinode-scenario
+    override-checkout: stable/queens
+    vars:
+      branch_override: stable/queens
+
+- job:
     name: neutron-tempest-plugin-designate-scenario
     parent: neutron-tempest-plugin-scenario
     description: Neutron designate integration scenario
@@ -168,6 +189,13 @@
       - ^setup.cfg$
     voting: false
 
+- job:
+    name: neutron-tempest-plugin-designate-scenario-queens
+    parent: neutron-tempest-plugin-designate-scenario
+    override-checkout: stable/queens
+    vars:
+      branch_override: stable/queens
+
 - project-template:
     name: neutron-tempest-plugin-jobs
     check:
@@ -182,6 +210,19 @@
         - neutron-tempest-plugin-api
         - build-openstack-sphinx-docs
 
+- project-template:
+    name: neutron-tempest-plugin-jobs-stable
+    check:
+      jobs:
+        - neutron-tempest-plugin-api-queens
+        - neutron-tempest-plugin-designate-scenario-queens
+        - neutron-tempest-plugin-dvr-multinode-scenario-queens
+        - neutron-tempest-plugin-scenario-linuxbridge-queens
+    gate:
+      jobs:
+        - neutron-tempest-plugin-api-queens
+
 - project:
     templates:
       - neutron-tempest-plugin-jobs
+      - neutron-tempest-plugin-jobs-stable

playbooks/neutron-tempest-plugin-api/run.yaml

diff --git a/playbooks/neutron-tempest-plugin-api/run.yaml b/playbooks/neutron-tempest-plugin-api/run.yaml
index 12638cc..230ac10 100644
--- a/playbooks/neutron-tempest-plugin-api/run.yaml
+++ b/playbooks/neutron-tempest-plugin-api/run.yaml
@@ -34,7 +34,7 @@
           export DEVSTACK_GATE_EXERCISES=0
           export DEVSTACK_GATE_TEMPEST_REGEX="neutron_tempest_plugin.api"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin"
-          export BRANCH_OVERRIDE=default
+          export BRANCH_OVERRIDE="{{ branch_override | default('default') }}"
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi