openstack
/
devstack
Code Issues Proposed changes

Move install_infra before execute build_wheels.sh 

The pip_install_gr function in build_wheels.sh use requirements project.
So requirements project must exist before execute build_wheels.sh.
Then we moved install_infra function which install requirements project.

Change-Id: I8f80ecafff0f7e1942731379b70bccac338ea3b3
Closes-Bug: 1453012
This commit is contained in:
Yuki Nishiwaki 2015-05-08 16:29:55 +09:00 committed by Sean Dague
parent ce5325db60
commit 60e37120de
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stack.sh
View File

@ -705,6 +705,9 @@ source $TOP_DIR/tools/fixup_stuff.sh
# Virtual Environment
# -------------------
# Install required infra support libraries
install_infra
# Pre-build some problematic wheels
if [[ -n ${WHEELHOUSE:-} && ! -d ${WHEELHOUSE:-} ]]; then
source $TOP_DIR/tools/build_wheels.sh
@ -719,10 +722,6 @@ fi
# Extras Pre-install
# ------------------
# Install required infra support libraries
install_infra
# Phase: pre-install
run_phase stack pre-install