aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorNauman_Ahad <Nauman_Ahad@dell.com>2016-01-07 13:09:45 +0500
committerNauman_Ahad <Nauman_Ahad@dell.com>2016-01-07 13:09:45 +0500
commit11c81d90581606c0bde98e04a4f739eed4bcbf6d (patch)
treebf11d3f1cf619cc617e736208a812ea828bd1f2c /docker
parent61159e1e4f028dbb34573f2186d448be578894ee (diff)
Slight changes to the run_qtip.sh script
Modifications needed in run_qtip.sh for Jenkins Jobs to run. Docker file changed too. get_env.sh script location changed too. Testcases for dell-us-deploying-bm-3 lab added along with the default testcase directory Change-Id: I293febda0ddd3d56d1c455fde220dc78a57b6c18 Signed-off-by: Nauman_Ahad <Nauman_Ahad@dell.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile8
-rwxr-xr-xdocker/run_qtip.sh37
2 files changed, 34 insertions, 11 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0087689c..f9f8f10f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -36,16 +36,16 @@ RUN apt-get install ansible --force-yes -y
-RUN mkdir -p ${repos_dir}
+RUN mkdir -p ${REPOS_DIR}
RUN mkdir -p /root/.ssh
RUN chmod 700 /root/.ssh
#Cloning Repos
RUN git config --global http.sslVerify false
-RUN git clone https://gerrit.opnfv.org/gerrit/qtip $repos_dir/qtip
-RUN git clone https://gerrit.opnfv.org/gerrit/releng $repos_dir/releng
+RUN git clone https://gerrit.opnfv.org/gerrit/qtip $REPOS_DIR/qtip
+RUN git clone https://gerrit.opnfv.org/gerrit/releng $REPOS_DIR/releng
-RUN pip install -r $repos_dir/qtip/docker/packages.pip
+RUN pip install -r $REPOS_DIR/qtip/docker/packages.pip
diff --git a/docker/run_qtip.sh b/docker/run_qtip.sh
index dd3d322f..f6a78e74 100755
--- a/docker/run_qtip.sh
+++ b/docker/run_qtip.sh
@@ -1,16 +1,39 @@
#! /bin/bash
+
+
cp ${REPOS_DIR}/releng/utils/fetch_os_creds.sh ${QTIP_DIR}/data/
-cd ${QTIP_DIR}/data && source get_env_info.sh -n ${INSTALLER_TYPE} -i ${INSTALLER_IP}
+cd ${QTIP_DIR} && source get_env_info.sh \
+-n ${INSTALLER_TYPE} \
+-i ${INSTALLER_IP}
+
source ${QTIP_DIR}/data/opnfv-creds.sh
-cd ${QTIP_DIR} && python qtip.py -l ${LAB} -f compute.txt
-cd ${QTIP_DIR} && python qtip.py -l ${LAB} -f storage.txt
-cd ${QTIP_DIR} && python qtip.py -l ${LAB} -f network.txt
-cd ${QTIP_DIR}/data/ref_results/ $$ python compute_suite.py
-cd ${QTIP_DIR}/data/ref_results/ $$ python storage_suite.py
-cd ${QTIP_DIR}/data/ref_results/ $$ python network_suite.py
+if [ "$TEST_CASE" == "compute" ]; then
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f compute.txt
+ cd ${QTIP_DIR}/data/ref_results/ $$ python compute_suite.py
+fi
+
+if [ "$TEST_CASE" == "storage" ]; then
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f storage.txt
+ cd ${QTIP_DIR}/data/ref_results/ $$ python storage_suite.py
+fi
+
+if [ "$TEST_CASE" == "network" ]; then
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f network.txt
+ cd ${QTIP_DIR}/data/ref_results/ $$ python network_suite.py
+fi
+
+
+if [ "$TEST_CASE" == "all" ]; then
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f compute.txt
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f storage.txt
+ cd ${QTIP_DIR} && python qtip.py -l ${NODE_NAME} -f network.txt
+ cd ${QTIP_DIR}/data/ref_results/ $$ python compute_suite.py
+ cd ${QTIP_DIR}/data/ref_results/ $$ python storage_suite.py
+ cd ${QTIP_DIR}/data/ref_results/ $$ python network_suite.py
+fi