From d83bd7313bfe1ae7c6b030e23da5fc1e57c4c470 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <andrey-mp@yandex.ru>
Date: Mon, 19 Oct 2015 12:01:05 +0300
Subject: [PATCH] fixes for experimental pipeline

Change-Id: I4e50b79c2d7a74634a52e86570373c6ab48a9f5f
---
 ec2api/tests/contrib/post_test_hook.sh | 12 +++++++++---
 rally-scenarios/ec2-api-fakevirt.yaml  |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ec2api/tests/contrib/post_test_hook.sh b/ec2api/tests/contrib/post_test_hook.sh
index 30f05834..01f69c61 100755
--- a/ec2api/tests/contrib/post_test_hook.sh
+++ b/ec2api/tests/contrib/post_test_hook.sh
@@ -45,13 +45,19 @@ if [[ ! -f $TEST_CONFIG_DIR/$TEST_CONFIG ]]; then
 
   if [[ $RUN_LONG_TESTS == "1" ]]; then
     REGULAR_IMAGE_URL="https://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-i386-disk1.img"
+    REGULAR_IMAGE_NAME="precise-server-cloudimg-i386-disk1.img"
     REGULAR_IMAGE_FNAME="precise"
-    openstack image create --disk-format raw --container-format bare --public --location $REGULAR_IMAGE_URL $REGULAR_IMAGE_FNAME
+    sudo rm /tmp/$REGULAR_IMAGE_NAME
+    wget -nv -P /tmp $REGULAR_IMAGE_URL
     if [[ "$?" -ne "0" ]]; then
-      echo "Creation precise image failed"
+      echo "Downloading of precise image failed."
+      exit 1
+    fi
+    openstack image create --disk-format raw --container-format bare --public --file /tmp/$REGULAR_IMAGE_NAME $REGULAR_IMAGE_FNAME
+    if [[ "$?" -ne "0" ]]; then
+      echo "Creation of precise image failed."
       exit 1
     fi
-    sleep 60
     # find this image
     image_id_ubuntu=$(euca-describe-images --show-empty-fields | grep "precise" | grep "ami-" | head -n 1 | awk '{print $2}')
   fi
diff --git a/rally-scenarios/ec2-api-fakevirt.yaml b/rally-scenarios/ec2-api-fakevirt.yaml
index 0e9ad9c7..41f207ce 100644
--- a/rally-scenarios/ec2-api-fakevirt.yaml
+++ b/rally-scenarios/ec2-api-fakevirt.yaml
@@ -13,7 +13,7 @@
         ec2api_servers:
           flavor: "m1.nano"
           image: "*cirros*"
-          servers_per_tenant: 200
+          servers_per_tenant: 100
           run_in_vpc: False
           assign_floating_ip: False
           build_timeout: 150
@@ -30,7 +30,7 @@
         ec2api_servers:
           flavor: "m1.nano"
           image: "*cirros*"
-          servers_per_tenant: 200
+          servers_per_tenant: 100
           servers_per_run: 4
           run_in_vpc: True
           assign_floating_ip: True