From de1deef3cdcb05d4383e78b9ec39a0f2b4781edf Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Mon, 13 Jun 2016 12:31:11 -0400
Subject: [PATCH] Add python3 wheel-builds

Change-Id: Ic535389ecdd43c76b02aa0215d21c9fce4b4547d
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 jenkins/jobs/projects.yaml | 13 +++++--------
 zuul/layout.yaml           | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 36194546bd..d645481335 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -8338,20 +8338,17 @@
       # up-to-date. Adding it to the requirements project seems to be the best
       # place to put it, though it's not strictly a requirement for
       # requirements.
-      - wheel-build-{node_arch}-{python}:
-          node_arch:
-            - ubuntu-trusty-amd64
-          python: python2
-      - wheel-release-{mirror_arch}:
-          mirror_arch:
-            - trustyx64
       - wheel-build-{node_arch}-{python}:
           node_arch:
             - centos-7-amd64
-          python: python2
+            - ubuntu-trusty-amd64
+          python:
+            - python2
+            - python3
       - wheel-release-{mirror_arch}:
           mirror_arch:
             - cent7x64
+            - trustyx64
 
 - project:
     name: requirements-jobs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 97455ac54b..2cdd71ec23 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -602,8 +602,12 @@ project-templates:
         - '{name}-pypi-both-upload':
             - wheel-build-ubuntu-trusty-amd64-python2:
               - wheel-release-trustyx64
+            - wheel-build-ubuntu-trusty-amd64-python3:
+              - wheel-release-trustyx64
             - wheel-build-centos-7-amd64-python2:
               - wheel-release-cent7x64
+            - wheel-build-centos-7-amd64-python3:
+              - wheel-release-cent7x64
             - '{name}-announce-release'
 
   # Release OpenStack Server packages.
@@ -2861,12 +2865,18 @@ jobs:
   - name: wheel-build-ubuntu-trusty-amd64-python2
     mutex: mirror.wheel.trustyx64
 
+  - name: wheel-build-ubuntu-trusty-amd64-python3
+    mutex: mirror.wheel.trustyx64
+
   - name: wheel-release-trustyx64
     mutex: mirror.wheel.trustyx64
 
   - name: wheel-build-centos-7-amd64-python2
     mutex: mirror.wheel.cent7x64
 
+  - name: wheel-build-centos-7-amd64-python3
+    mutex: mirror.wheel.cent7x64
+
   - name: wheel-release-cent7x64
     mutex: mirror.wheel.cent7x64
 
@@ -11186,8 +11196,12 @@ projects:
       - propose-requirements-constraints-master
       - wheel-build-ubuntu-trusty-amd64-python2:
         - wheel-release-trustyx64
+      - wheel-build-ubuntu-trusty-amd64-python3:
+        - wheel-release-trustyx64
       - wheel-build-centos-7-amd64-python2:
         - wheel-release-cent7x64
+      - wheel-build-centos-7-amd64-python3:
+        - wheel-release-cent7x64
     post:
       - propose-requirements-updates