From c42e5b510d66bc41a82c6ddf014fbaa44bc7b0e2 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 16 Jan 2018 08:11:28 +0100 Subject: Fix stable pike build errors This is a squash of two commits that need to be merged together in order to get all tests to pass: Commit message #1: Use Zuul v3 fetch-subunit-output We have consolidated the fetch output roles into one fetch-subunit-output, replace useage of old roles with new one. Original change-id: Iae2892d9b4cd870a11579434edc9ee66bd16798c (cherry picked from commit 0a2ee90204068a1284f207397bcb253ec1e13c7e) Commit message #2: Fix sphinx-docs job for stable branch build-openstack-sphinx-docs jobs fail on stable branches because the new pip version 10 changed a Warning into an Error: When calling "pip install" without any package name, the command now fails. tox_install.sh is being called during docs job without any package passed to pip. Note that this only affects stable/pike and older, so there is no patch in master to cherry-pick this from. Newer branches use a different way to set up the tox environment. Depends-On: https://review.openstack.org/573665 Change-Id: I35e9ede7103031ea3ea45e35d743e63059fb8d0b --- playbooks/osc-devstack/post.yaml | 3 +-- tools/tox_install.sh | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/playbooks/osc-devstack/post.yaml b/playbooks/osc-devstack/post.yaml index db7ca7d6..a1983648 100644 --- a/playbooks/osc-devstack/post.yaml +++ b/playbooks/osc-devstack/post.yaml @@ -1,4 +1,3 @@ - hosts: all roles: - - fetch-tox-output - - fetch-stestr-output + - fetch-subunit-output diff --git a/tools/tox_install.sh b/tools/tox_install.sh index 4af3be16..dc1ddc11 100755 --- a/tools/tox_install.sh +++ b/tools/tox_install.sh @@ -51,5 +51,10 @@ fi # install will be constrained and we need to unconstrain it. edit-constraints $localfile -- $CLIENT_NAME "-e file://$PWD#egg=$CLIENT_NAME" +if [ -z "$*" ]; then + echo "No packages to be installed." + exit 0 +fi + $install_cmd -U $* exit $? -- cgit v1.2.1