Revert "Build wheel house during nodepool devstack caching"

This reverts commit 1f84dbb2ce.

Reverting because this runs a significant portion of devstack during
image builds installing packages necessary to build the wheels. Instead
we should be building wheels and hosting them on our mirror. Then image
builds and jobs themselves can both use this mirror to either cache
wheels or install wheels.

Conflicts:
	nodepool/scripts/cache_devstack.py

Change-Id: I70ebc57076845995c539a42e4f87e241569211b4
This commit is contained in:
Clark Boylan 2015-03-12 17:06:52 -07:00
parent da4f071588
commit c1a8b3e76e
2 changed files with 0 additions and 47 deletions

View File

@ -1,35 +0,0 @@
#!/bin/bash
# Copyright (C) 2015 Hewlett-Packard Development Company, L.P.
#
# 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.
set -eux
DEVSTACK='/opt/git/openstack-dev/devstack'
export WHEELHOUSE='/home/jenkins/cache/files/wheelhouse'
pushd $DEVSTACK
for branch in $(git branch -a | grep '^\s*remotes/origin') ; do
if [[ $(echo $branch | grep '^->') || $(echo $branch | grep "^origin") || $(echo $branch | grep 'HEAD') ]]; then
continue
fi
sudo git checkout $branch
if [[ -f $DEVSTACK/tools/build_wheels.sh ]] ; then
bash tools/build_wheels.sh
fi
done
popd

View File

@ -94,17 +94,6 @@ def _find_images(basedir):
return images
def _build_wheelhouse(basedir):
build_wheels_path = os.path.join(basedir, 'tools/build_wheels.sh')
if os.path.isfile(build_wheels_path):
env = os.environ
# Makes output dir for wheelhouse CACHEDIR/wheelhouse
env['WHEELHOUSE'] = os.path.join(CACHEDIR, 'wheelhouse')
output = run_local(['bash', 'tools/build_wheels.sh'], cwd=DEVSTACK,
env=env)
print output
def local_prep(distribution):
branches = []
for branch in git_branches():
@ -144,7 +133,6 @@ def local_prep(distribution):
branch_data['images'] = images
branches.append(branch_data)
_build_wheelhouse(DEVSTACK)
return branches