commit 67469e710867fce4703d237d2645572f4d94da82
author ricolin <rico.lin.guanyu@gmail.com> Thu Jan 02 09:37:47 2020 +0800
committer ricolin <rico.lin.guanyu@gmail.com> Thu Jan 09 09:23:16 2020 +0800
tree acf5a3ad17c70377f142d6215e5bbed1e67f3640
parent 13b0bf9cc5d261cc1f1020259fb36c87ff245922

Update master(Ussuri) jobs and stable branch jobs

* Remove all python3 jobs for previous stable branches.

Depends-On: https://review.opendev.org/700830
Depends-On: https://review.opendev.org/700854
Depends-On: https://review.opendev.org/700855
Depends-On: https://review.opendev.org/700857

Depends-On: https://review.opendev.org/701345

Story: #2007061
Task: #37922
Task: #37923

Task: #37901

Change-Id: I15ea84d4c1c32fa689dd3bed61ff26086da5f595

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 88da946..4f55a7a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,32 +2,89 @@
     name: heat-functional-convg-queens
     parent: heat-functional-convg-mysql-lbaasv2
     override-checkout: stable/queens
+    vars:
+      branch_override: stable/queens
+    nodeset:
+      nodes:
+        - name: primary
+          label: ubuntu-xenial
 
 - job:
     name: heat-functional-orig-queens
     parent: heat-functional-orig-mysql-lbaasv2
     override-checkout: stable/queens
-
-- job:
-    name: heat-functional-convg-queens-py35
-    parent: heat-functional-convg-mysql-lbaasv2-py35
-    override-checkout: stable/queens
+    vars:
+      branch_override: stable/queens
+    nodeset:
+      nodes:
+        - name: primary
+          label: ubuntu-xenial
 
 - job:
     name: heat-functional-convg-rocky
     parent: heat-functional-convg-mysql-lbaasv2
     override-checkout: stable/rocky
+    vars:
+      branch_override: stable/rocky
+    nodeset:
+      nodes:
+        - name: primary
+          label: ubuntu-xenial
 
 - job:
     name: heat-functional-orig-rocky
     parent: heat-functional-orig-mysql-lbaasv2
     override-checkout: stable/rocky
+    vars:
+      branch_override: stable/rocky
+    nodeset:
+      nodes:
+        - name: primary
+          label: ubuntu-xenial
 
 - job:
-    name: heat-functional-convg-rocky-py35
-    parent: heat-functional-convg-mysql-lbaasv2-py35
-    override-checkout: stable/rocky
+    name: heat-functional-convg-stein
+    parent: heat-functional-convg-mysql-lbaasv2
+    override-checkout: stable/stein
+    vars:
+      branch_override: stable/stein
+    nodeset:
+      nodes:
+        - name: primary
+          label: ubuntu-xenial
 
+- job:
+    name: heat-functional-orig-stein
+    parent: heat-functional-orig-mysql-lbaasv2
+    override-checkout: stable/stein
+    vars:
+      branch_override: stable/stein
+    nodeset:
+      nodes:
+        - name: primary
+          label: ubuntu-xenial
+
+- job:
+    name: heat-functional-convg-train
+    parent: heat-functional-convg-mysql-lbaasv2
+    override-checkout: stable/train
+    vars:
+      branch_override: stable/train
+    nodeset:
+      nodes:
+        - name: primary
+          label: ubuntu-xenial
+
+- job:
+    name: heat-functional-orig-train
+    parent: heat-functional-orig-mysql-lbaasv2
+    override-checkout: stable/train
+    vars:
+      branch_override: stable/train
+    nodeset:
+      nodes:
+        - name: primary
+          label: ubuntu-xenial
 
 - project:
     templates:
@@ -35,19 +92,19 @@
       - tempest-plugin-jobs
     check:
       jobs:
-        - heat-functional-orig-mysql-lbaasv2
-        - heat-functional-convg-mysql-lbaasv2
-        - heat-functional-convg-mysql-lbaasv2-non-apache
-        - heat-functional-convg-mysql-lbaasv2-py35
+        - heat-functional
+        - heat-functional-non-apache
+        - heat-functional-legacy
         - heat-functional-convg-queens
-        - heat-functional-convg-queens-py35
         - heat-functional-orig-queens
         - heat-functional-convg-rocky
-        - heat-functional-convg-rocky-py35
         - heat-functional-orig-rocky
+        - heat-functional-convg-stein
+        - heat-functional-orig-stein
+        - heat-functional-convg-train
+        - heat-functional-orig-train
     gate:
       queue: heat
       jobs:
-        - heat-functional-orig-mysql-lbaasv2
-        - heat-functional-convg-mysql-lbaasv2
-        - heat-functional-convg-mysql-lbaasv2-py35
+        - heat-functional
+        - heat-functional-legacy