From 1f56c5036eb1a32e95fed2c03efbd389138f9abd Mon Sep 17 00:00:00 2001 From: Don Penney Date: Thu, 7 Feb 2019 10:52:11 -0500 Subject: [PATCH] Add support for building wheels from master branches This update enhances build-base-wheels.sh to support using a wildcard in wheels.cfg for the wheel name, to allow for whatever the version is when building from master for a given repo. This also updates master-wheels.cfg to build the following modules from master, to pick up the latest code for these supporting modules: neutron-lib python-openstackclient openstacksdk Story: 2004751 Task: 29395 Change-Id: Ifab8a209170a00f58e0f4a53b6cbd7e4fe86e8f0 Signed-off-by: Don Penney --- build-tools/build-wheels/build-base-wheels.sh | 2 +- build-tools/build-wheels/docker/master-wheels.cfg | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build-tools/build-wheels/build-base-wheels.sh b/build-tools/build-wheels/build-base-wheels.sh index a72c0326..20c6ad55 100755 --- a/build-tools/build-wheels/build-base-wheels.sh +++ b/build-tools/build-wheels/build-base-wheels.sh @@ -140,7 +140,7 @@ fi # Check to see if we need to build anything BUILD_NEEDED=no for wheel in $(cat ${WHEELS_CFG} | sed 's/#.*//' | awk -F '|' '{print $1}'); do - if [ ! -f ${BUILD_OUTPUT_PATH}/${wheel} ]; then + if [[ "${wheel}" =~ \* || ! -f ${BUILD_OUTPUT_PATH}/${wheel} ]]; then BUILD_NEEDED=yes break fi diff --git a/build-tools/build-wheels/docker/master-wheels.cfg b/build-tools/build-wheels/docker/master-wheels.cfg index bfdf4a9d..b227dc7f 100644 --- a/build-tools/build-wheels/docker/master-wheels.cfg +++ b/build-tools/build-wheels/docker/master-wheels.cfg @@ -9,3 +9,6 @@ lz4-0.9.0-cp27-none-linux_x86_64.whl|git|https://github.com/python-lz4/python-lz4|python-lz4|v0.9.0 panko-5.0.0-py2-none-any.whl|tar|https://files.pythonhosted.org/packages/a9/89/d666e0889d869e41c9b7f87a0a34858b2520782b82e025da84c98e0db8f6/panko-5.0.0.tar.gz|panko-5.0.0 google_api_python_client-1.7.7-py2.py3-none-any.whl|pypi|https://files.pythonhosted.org/packages/d7/47/940908e52487440f61fb93ad55cbbe3a28235d3bb143b26affb17b37dd28/google_api_python_client-1.7.7-py2.py3-none-any.whl +neutron_lib-*.whl|git|https://github.com/openstack/neutron-lib|neutron-lib|master +python_openstackclient-*.whl|git|https://github.com/donpenney/python-openstackclient|python-openstackclient|master +openstacksdk-*.whl|git|https://github.com/openstack/openstacksdk|openstacksdk|master