Make functional src jobs actually install from source

devstack will happily install openstacksdk from source here just from
required-projects, but we install nodepool into a virtualenv, and that
is just doing a pip install.

Add an install_openstacksdk function that installs openstacksdk into the
virtualenv so that the devstack magic for installing from source works.

Change-Id: I68c16d8601f6fd96863f205094d27c0da09ef73c
This commit is contained in:
Monty Taylor 2018-10-21 08:24:03 -05:00
parent 198b326f46
commit 34dcacfdba
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 13 additions and 1 deletions

View File

@ -43,6 +43,13 @@ function install_glean {
}
function install_openstacksdk {
if use_library_from_git "openstacksdk"; then
git_clone_by_name "openstacksdk"
$NODEPOOL_INSTALL/bin/pip install $DEST/openstacksdk
fi
}
# Install nodepool code
function install_nodepool {
VENV="virtualenv -p python3"
@ -52,6 +59,11 @@ function install_nodepool {
setup_develop $DEST/nodepool
$NODEPOOL_INSTALL/bin/pip install $DEST/nodepool
# TODO(mordred) Install openstacksdk after nodepool so that if we're
# in the -src job we don't re-install from the requirement.
# We should make this more resilient, probably using install-siblings.
install_openstacksdk
$NODEPOOL_INSTALL/bin/pbr freeze
}

View File

@ -7,7 +7,7 @@ extras
statsd>=3.0
sqlalchemy>=0.8.2,<1.1.0
PrettyTable>=0.6,<0.8
openstacksdk>=0.17.2
openstacksdk>=0.17.2,!=0.18.0
diskimage-builder>=2.0.0
voluptuous
kazoo