aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerry Flood <jf9860@att.com>2017-06-02 16:46:11 -0400
committerJerry Flood <jf9860@att.com>2017-06-02 17:35:16 -0400
commit633a15d4c54446ace1e63a4d6c0cd9e7b1d45d71 (patch)
treebb8abff77f69f34e01ae64df25facc13e49a54ab
parentcf7d746ed9dcc21427a2b15161751f090a884b08 (diff)
Added support for soak test config file
Issue: TEST-38 Change-Id: I40fdad36019cbfa6bee6e9ef7bf6193deb27fd47 Signed-off-by: Jerry Flood <jf9860@att.com>
-rw-r--r--docker/Dockerfile6
-rw-r--r--runSoak.sh25
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 <filename> -d <seconds> -c <seconds>]"
+ 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