From 633a15d4c54446ace1e63a4d6c0cd9e7b1d45d71 Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Fri, 2 Jun 2017 16:46:11 -0400 Subject: [PATCH] Added support for soak test config file Issue: TEST-38 Change-Id: I40fdad36019cbfa6bee6e9ef7bf6193deb27fd47 Signed-off-by: Jerry Flood --- docker/Dockerfile | 6 ++++-- runSoak.sh | 25 +++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a39fb43c..5d91cd3d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update && \ pip install --upgrade pip && \ pip install robotframework && \ python --version - + # Install chrome RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \ echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list && \ @@ -23,10 +23,12 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key # Copy the robot code COPY / /var/opt/OpenECOMP_ETE/ -COPY lighttpd.conf /etc/lighttpd/lighttpd.conf +COPY lighttpd.conf /etc/lighttpd/lighttpd.conf RUN chmod 777 /var/opt/OpenECOMP_ETE/setup.sh RUN chmod 777 /var/opt/OpenECOMP_ETE/runTags.sh RUN chmod 777 /var/opt/OpenECOMP_ETE/dnstraffic.sh +chmod 777 /var/opt/OpenECOMP_ETE/runSoak.sh +chmod 777 /var/opt/OpenECOMP_ETE/runEteTag.sh # Update the ssh library so that it will run properly in the docker env RUN cd /var/opt/OpenECOMP_ETE && ./setup.sh diff --git a/runSoak.sh b/runSoak.sh index 3b223ae7..07691971 100644 --- a/runSoak.sh +++ b/runSoak.sh @@ -1,7 +1,28 @@ #!/bin/bash INSTALL_DIR=/var/opt/OpenECOMP_ETE -DURATION=$1 +# +# Execute tags built to support the hands on demo, +# +function usage +{ + echo "Usage: runSoak.sh [-p -d -c ]" + echo " " + echo " -p, --profile" + echo " - name of JSON file containing test profile" + echo " " + echo " -d, --duration" + echo " - Duration of soak test (overrides value --profile)" + echo " " + echo " -c, --cyclelength" + echo " - Time between starting iterations of profile" + echo " If longer than total run time of a single iteration," + echo " additional wait is added before starting the next iteration." + echo " Value has no effect if it is shorter than the total run time" + echo " of a single iteration over the profile." + echo " (overrides value in --profile)" +} + cd ${INSTALL_DIR} export PYTHONPATH=${INSTALL_DIR}/robot/library -python -m loadtest.TestMain -d ${DURATION} --logfile /share/logs/soak_$$.log \ No newline at end of file +python -m loadtest.TestMain $@ --logfile /share/logs/soak_$$.log \ No newline at end of file -- 2.16.6