Fix the depends-on gating for basic.sh
The gate-quickstart role uninstalls the 'tripleo-quickstart-extras' package from the virtual env if it finds a change for it, while modifying the quickstart-extras-requirements.txt to get it reinstalled from the locally checked out version with the next run. That run requires the --bootstrap option to rerun the pip commands and reinstall. This was missing from basic.sh. The previous workaround is not needed which manually installed the repo. Removing the workaround fixes a bug that broke devmode.sh. Closes-bug: #1696532 Change-Id: I65a1b286a03e9f039c75b930e3eca5ceedeb0fd6
This commit is contained in:
parent
80fa4404ac
commit
81574cf453
|
@ -30,6 +30,7 @@ source $CI_SCRIPT_DIR/include-gate-changes.sh
|
|||
bash quickstart.sh \
|
||||
--working-dir $WORKSPACE/ \
|
||||
--no-clone \
|
||||
--bootstrap \
|
||||
--release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
|
||||
$VIRTHOST
|
||||
|
||||
|
|
|
@ -23,11 +23,3 @@ if [ -d $WORKSPACE/tripleo-quickstart-gate-repo ]; then
|
|||
# Change into the new quickstart directory to use the new changes
|
||||
cd $WORKSPACE/tripleo-quickstart
|
||||
fi
|
||||
export VIRTUAL_ENV=$WORKSPACE
|
||||
export PATH="$VIRTUAL_ENV/bin:$PATH"
|
||||
pushd $WORKSPACE/tripleo-quickstart
|
||||
python setup.py install
|
||||
popd
|
||||
pushd $WORKSPACE/tripleo-quickstart-extras
|
||||
python setup.py install
|
||||
popd
|
Loading…
Reference in New Issue