Create and upload wheels

We want to make wheels for pre-release and release events. We will only
build wheels on python 2.7. If the project supports python 3 as well, the
project will have marked itself as supporting universal wheels. If it does
that, python 2.7 will build a wheel that can be used in both places. If it
does not support python 3, then we don't have to build on on python 3.

Change-Id: I060b59d8adc586ff37065fa4f6172a592ee3f903

modules/openstack_project/files/jenkins_job_builder/config/macros.yaml

@@ -209,7 +209,10 @@
 - builder:
     name: tarball
     builders:
-      - shell: "/usr/local/jenkins/slave_scripts/run-tarball.sh {github-org} {project}"
+      - shell: |
+          #!/bin/bash -xe
+          /usr/local/jenkins/slave_scripts/run-tarball.sh {github-org} {project}
+          /usr/local/jenkins/slave_scripts/run-wheel.sh {github-org} {project}
 
 - builder:
     name: devstack-checkout
@@ -306,6 +309,17 @@
             - target: 'tarballs/{project}/'
               source: 'dist/*.tar.gz'
 
+- publisher:
+    name: wheel
+    publishers:
+      - archive:
+          artifacts: 'dist/*.whl'
+      - scp:
+          site: '{site}'
+          files:
+            - target: 'tarballs/{project}/'
+              source: 'dist/*.whl'
+
 - publisher:
     name: war
     publishers:

modules/openstack_project/files/jenkins_job_builder/config/pypi-jobs.yaml

@@ -1,12 +1,27 @@
 - job-template:
-    name: '{name}-pypi-upload'
+    name: '{name}-pypi-both-upload'
     node: pypi
 
     builders:
       - revoke-sudo
       - gerrit-git-prep
       - shell: |
-          /usr/local/jenkins/slave_scripts/pypi-upload.sh {name} {tarball-site}
+          /usr/local/jenkins/slave_scripts/pypi-tarball-upload.sh {name} {tarball-site}
+          /usr/local/jenkins/slave_scripts/pypi-wheel-upload.sh {name} {tarball-site}
+
+    publishers:
+      - console-log
+
+
+- job-template:
+    name: '{name}-pypi-wheel-upload'
+    node: pypi
+
+    builders:
+      - revoke-sudo
+      - gerrit-git-prep
+      - shell: |
+          /usr/local/jenkins/slave_scripts/pypi-wheel-upload.sh {name} {tarball-site}
 
     publishers:
       - console-log
@@ -15,4 +30,5 @@
 - job-group:
     name: pypi-jobs
     jobs:
-      - '{name}-pypi-upload'
+      - '{name}-pypi-both-upload'
+      - '{name}-pypi-wheel-upload'

modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml

@@ -200,6 +200,9 @@
       - tarball:
           project: '{name}'
           site: '{tarball-site}'
+      - wheel:
+          project: '{name}'
+          site: '{tarball-site}'
       - console-log
 
 

modules/openstack_project/files/slave_scripts/pypi-upload.sh

@@ -1,36 +0,0 @@
-#!/bin/bash -xe
-#
-# Copyright 2012 Hewlett-Packard Development Company, L.P.
-# Copyright 2013 OpenStack Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# Retrieve a python sdist and upload it to pypi with Curl.
-
-PROJECT=$1
-TARBALL_SITE=$2
-TAG=`echo $ZUUL_REF | sed 's/^refs.tags.//'`
-
-# Look in the setup.cfg to determine if a package name is specified, but
-# fall back on the project name if necessary
-DISTNAME=`/usr/local/jenkins/slave_scripts/pypi-extract-name.py \
-    || echo $PROJECT`
-FILENAME="$DISTNAME-$TAG.tar.gz"
-
-rm -rf *tar.gz
-curl --fail -o $FILENAME http://$TARBALL_SITE/$PROJECT/$FILENAME
-
-# Make sure we actually got a gzipped file
-file -b $FILENAME | grep gzip
-
-twine upload -r pypi $FILENAME