fix experimental pipeline with post_test_hook.sh

Change-Id: If90a65e3697a321ea65d17801f914edc9d377da3
This commit is contained in:
Andrey Pavlov 2016-04-12 11:30:45 +03:00
parent 391640b203
commit 5c82883a26
2 changed files with 7 additions and 3 deletions

View File

@ -83,7 +83,7 @@ if [[ $RUN_LONG_TESTS == "1" ]]; then
exit 1
fi
# find this image
image_id_ubuntu=$(euca-describe-images --show-empty-fields | grep "$REGULAR_IMAGE_NAME" | grep "ami-" | head -n 1 | awk '{print $2}')
image_id_ubuntu=`aws $AWS_PARAMS --profile admin ec2 describe-images --filters Name=image-type,Values=machine Name=name,Values=$REGULAR_IMAGE_NAME --query 'Images[0].ImageId' --output text`
fi
# create separate user/project

View File

@ -48,9 +48,13 @@ if [[ ! -f $EC2API_DIR/$TEST_CONFIG ]]; then
fi
fi
echo "---------------------------------------------------------- Config -"
cat $EC2API_DIR/$TEST_CONFIG
echo "-------------------------------------------------------------------"
sudo pip install virtualenv
sudo rm -rf .venv
sudo virtualenv .venv --system-site-package
sudo virtualenv .venv
sudo chown -R $USER .venv
source .venv/bin/activate
pip install -r test-requirements.txt
@ -62,7 +66,7 @@ deactivate
# list resources to check what left after tests
EC2_URL=`openstack endpoint list --service ec2 --interface public --os-identity-api-version=3 -c URL -f value`
AWS_PARAMS="--region $REGION_NAME --endpoint-url $EC2_URL"
AWS_PARAMS="--region RegionOne --endpoint-url $EC2_URL"
echo "========================================================================================================"
echo "==================================================================================== Admin resources ==="
echo "========================================================================================================"