Merge "Create and upload wheels"

modules/jenkins/files/slave_scripts/pypi-extract-universal.py

@@ -0,0 +1,28 @@
+#!/usr/bin/python
+#
+# 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.
+#
+# Extract Python package name from setup.cfg
+
+import ConfigParser
+
+universal = False
+
+setup_cfg = ConfigParser.SafeConfigParser()
+setup_cfg.read("setup.cfg")
+if setup_cfg.has_section("wheel"):
+    universal = setup_cfg.getboolean("wheel", "universal")
+if universal:
+    print("py2.py3")
+else:
+    print("py27")

modules/jenkins/files/slave_scripts/pypi-wheel-upload.sh

@@ -0,0 +1,38 @@
+#!/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 supported python wheels and upload them 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`
+# Look in the setup.cfg to see if this is a universal wheel or not
+WHEELTYPE=`/usr/local/jenkins/slave_scripts/pypi-extract-universal.py`
+FILENAME="$DISTNAME-$TAG.$WHEELTYPE-none-any.whl"
+
+rm -rf *.whl
+curl --fail -o $FILENAME http://$TARBALL_SITE/$PROJECT/$FILENAME
+
+# Make sure we actually got a wheel
+file -b $FILENAME | grep -i zip
+
+twine upload -r pypi $FILENAME

modules/jenkins/files/slave_scripts/run-wheel.sh

@@ -0,0 +1,38 @@
+#!/bin/bash -xe
+
+# 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.
+
+org=$1
+project=$2
+
+if [[ -z "$org" || -z "$project" ]]
+then
+  echo "Usage: $0 ORG PROJECT"
+  echo
+  echo "ORG: The project organization (eg 'openstack')"
+  echo "PROJECT: The project name (eg 'nova')"
+  exit 1
+fi
+
+source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
+
+rm -f dist/*.tar.gz
+tox -evenv pip install wheel
+tox -evenv python setup.py bdist_wheel
+
+echo "SHA1sum: "
+sha1sum dist/*
+echo "MD5sum: "
+md5sum dist/*

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

@@ -214,7 +214,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
@@ -311,6 +314,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