From caeb3281e557f7c710a37063e198bfa2030d72be Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 16 Mar 2016 10:42:23 -0400 Subject: [PATCH] call the ansible playbook before running tox, so that we have py2.6 in Signed-off-by: Alfredo Deza --- radosgw-agent-pull-requests/build/build | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/radosgw-agent-pull-requests/build/build b/radosgw-agent-pull-requests/build/build index 33b6b98b..d7c3aea2 100644 --- a/radosgw-agent-pull-requests/build/build +++ b/radosgw-agent-pull-requests/build/build @@ -1,22 +1,17 @@ #!/bin/bash -set -ex +# the following two methods exist in scripts/build_utils.sh +pkgs=( "ansible" "tox" ) +install_python_packages "pkgs[@]" -# Create the virtualenv -virtualenv venv -. venv/bin/activate -# Define and ensure the PIP cache -PIP_SDIST_INDEX="$HOME/.cache/pip" -mkdir -p $PIP_SDIST_INDEX - -# Install the package by trying with the cache first, otherwise doing a download only, and then -# trying to install from the cache again. -if ! venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index tox; then - venv/bin/pip install --download-directory="$PIP_SDIST_INDEX" tox - venv/bin/pip install --find-links="file://$PIP_SDIST_INDEX" --no-index tox -fi +# run ansible to get this current host to meet our requirements, specifying +# a local connection and 'localhost' as the host where to execute. This might look +# odd because we are using ceph-deploy playbooks. But the requirements are the same +cd "$WORKSPACE/ceph-build/ceph-deploy-pull-requests/setup/playbooks" +$VENV/ansible-playbook -i "localhost," -c local setup.yml # create the build with tox -tox -rv +cd $WORKSPACE/radosgw-agent +$VENV/tox -rv -- 2.39.5