From f0e1ee0ccc25acf74f472146f4219350bfec0248 Mon Sep 17 00:00:00 2001 From: Taseer Ahmed Date: Tue, 14 Nov 2017 16:57:31 +0500 Subject: WIP - Use SNAPS to launch StorPerf Stack Change-Id: I8857e6e0dd2bf9cd7c38cf18a7c239d7eb993d05 Signed-off-by: Taseer Ahmed --- ci/verify-build.sh | 9 +++++++-- ci/verify.sh | 21 ++------------------- 2 files changed, 9 insertions(+), 21 deletions(-) (limited to 'ci') diff --git a/ci/verify-build.sh b/ci/verify-build.sh index 0477e17..c98fea4 100755 --- a/ci/verify-build.sh +++ b/ci/verify-build.sh @@ -19,7 +19,12 @@ export CARBON_DIR=${ci}/job/carbon/ ${ci}/remove_docker_container.sh mkdir -p ${CARBON_DIR} -touch ${ENV_FILE} +cat << EOF > ${ENV_FILE} +OS_USERNAME=username +OS_PASSWORD=password +OS_AUTH_URL=http://localhost +OS_PROJECT_NAME=project +EOF if [ -z $ARCH ] then @@ -60,7 +65,7 @@ set +e check_for_life storperf-httpfrontend "/" FAILURES=$((FAILURES + $?)) -check_for_life storperf-master "/api/v1.0/configurations" +check_for_life storperf-master "/api/v1.0/jobs" FAILURES=$((FAILURES + $?)) check_for_life storperf-reporting "/reporting/" diff --git a/ci/verify.sh b/ci/verify.sh index cd5bbbb..996a3af 100755 --- a/ci/verify.sh +++ b/ci/verify.sh @@ -22,28 +22,11 @@ pip install --upgrade setuptools==33.1.1 pip install autoflake==0.6.6 pip install autopep8==1.2.2 pip install coverage==4.1 -pip install flask==0.10 -pip install flask_cors==3.0.2 -pip install flask-restful==0.3.5 -pip install flask-restful-swagger==0.19 -pip install flask-swagger==0.2.12 -pip install funcsigs==0.4 +pip install cryptography==1.7.2 pip install flake8==2.5.4 -pip install html2text==2016.1.8 -pip install keystoneauth1==2.12.1 pip install mock==1.3.0 pip install nose==1.3.7 -pip install paramiko==2.0.2 -pip install python-cinderclient==1.6.0 -pip install python-glanceclient==1.1.0 -pip install python-heatclient==0.8.0 -pip install python-keystoneclient==1.6.0 -pip install python-neutronclient==2.6.0 -pip install python-novaclient==2.28.1 -pip install pyyaml==3.10 -pip install requests==2.13.0 -pip install scp==0.10.2 -pip install six==1.10.0 +pip install -r docker/storperf-master/requirements.pip final_rc=0 -- cgit 1.2.3-korg