summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authormbeierl <mark.beierl@dell.com>2017-06-30 22:30:02 -0400
committermbeierl <mark.beierl@dell.com>2017-07-04 12:19:47 -0400
commite7b94bbe52fdb0cdb5a95c5657a2e207580aca86 (patch)
tree1a1912a4e97e4b93f61863ddaa12f36d8b6c398a /ci
parent2c95b01efa53c7e7d4ea7d73fde0da6099938e50 (diff)
Multi-threaded HTTP Support
Adds multithreaded HTTP request abilities to ReST Server. Fixes docker-compose to ensure pull prior to up. Fixes metrics typo to make jobs API query work again. Change-Id: Ibac6188379cae0489792c5ea80f37dd3abf37082 JIRA: STORPERF-183 Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/launch_docker_container.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/launch_docker_container.sh b/ci/launch_docker_container.sh
index 2dfde93..4f4e38b 100755
--- a/ci/launch_docker_container.sh
+++ b/ci/launch_docker_container.sh
@@ -23,7 +23,8 @@ then
sudo chown 33:33 ${ci}/job/carbon
fi
-docker-compose -f ../docker-compose/docker-compose.yaml up -d
+docker-compose pull
+docker-compose up -d
echo "Waiting for StorPerf to become active"
curl -X GET 'http://127.0.0.1:5000/api/v1.0/configurations' > test.html 2>&1