From 3609471ada59d1daca9b06b5b224a19908359973 Mon Sep 17 00:00:00 2001 From: Luis Pabon Date: Mon, 9 Sep 2013 15:29:34 -0400 Subject: Tests should depend on PIP instead of Yum Unit tests now use pip to install the desired version of pip. Functional tests have been changed to use pip instead of yum to install the desired version of pip. Change-Id: I4ccc743385fb4258549c115e575c8834fd4d0561 Signed-off-by: Luis Pabon Reviewed-on: http://review.gluster.org/5853 Reviewed-by: Peter Portante --- tools/functional_tests.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'tools/functional_tests.sh') diff --git a/tools/functional_tests.sh b/tools/functional_tests.sh index e1be404..af76831 100755 --- a/tools/functional_tests.sh +++ b/tools/functional_tests.sh @@ -16,15 +16,13 @@ # limitations under the License. # Globals -FUNCTAG=functest.$$ cleanup() { sudo service memcached stop sudo swift-init main stop - sudo yum -y remove glusterfs-openstack-swift + sudo pip uninstall -y gluster-swift sudo rm -rf /etc/swift > /dev/null 2>&1 - rm -f build/glusterfs-openstack-swift-*${FUNCTAG}*rpm > /dev/null 2>&1 sudo rm -rf /mnt/gluster-object/test{,2}/* > /dev/null 2>&1 sudo setfattr -x user.swift.metadata /mnt/gluster-object/test{,2} > /dev/null 2>&1 } @@ -59,12 +57,15 @@ done export SWIFT_TEST_CONFIG_FILE=/etc/swift/test.conf -# Create and install the rpm -PKG_RELEASE=${FUNCTAG} bash makerpm.sh -sudo yum -y install build/glusterfs-openstack-swift-*${FUNCTAG}*.noarch.rpm || fail "Unable to install rpm" +# Download and cache swift +pip install --no-install --download-cache=$HOME/.pipcache swift==1.9.1 +# Install swift +sudo pip install --download-cache=$HOME/.pipcache swift==1.9.1 +# Install gluster-swift +sudo pip install -e $PWD # Install the configuration files -mkdir /etc/swift > /dev/null 2>&1 +sudo mkdir /etc/swift > /dev/null 2>&1 sudo cp -r test/functional/conf/* /etc/swift || fail "Unable to copy configuration files to /etc/swift" ( cd /etc/swift ; sudo gluster-swift-gen-builders test test2 ) || fail "Unable to create ring files" -- cgit