Merge "Revert "Remove networking-odl from g-r in the requirements-integration job""

This commit is contained in:
Zuul 2018-09-21 12:01:36 +00:00 committed by Gerrit Code Review
commit f0d276428f

View File

@ -16,18 +16,6 @@ function mkvenv {
function install_all_of_gr {
mkvenv $tmpdir/all_requirements
if grep -q ^networking-odl $REPODIR/requirements/global-requirements.txt ; then
cat <<EO_FIGLET
_ _ _ ____ _ __ _
| | | | / \ / ___|| |/ /| |
| |_| | / _ \ | | | ' / | |
| _ | / ___ \| |___ | . \ |_|
|_| |_|/_/ \_\\____||_|\_\(_)
EO_FIGLET
sed -i~ -e '/^networking-odl/d' $REPODIR/requirements/global-requirements.txt
diff -U0 $REPODIR/requirements/global-requirements.txt{~,} || true
fi
$tmpdir/all_requirements/bin/pip install -r $REPODIR/requirements/global-requirements.txt
}