summaryrefslogtreecommitdiffstats
path: root/rubbos/rubbos_scripts/1-1-1/scripts
diff options
context:
space:
mode:
authorQiLiang <liangqi1@huawei.com>2016-01-15 11:29:40 +0000
committerJun Li <matthew.lijun@huawei.com>2016-01-16 09:38:51 +0000
commit189f49b2be3cb06ab1cc9db458d44cd5c8bc1936 (patch)
treed183291a3f1ba9f9d31144104449f5c4e1acb927 /rubbos/rubbos_scripts/1-1-1/scripts
parent6a0c75d1702e70c67bf4e2141ce8d1c33fa23562 (diff)
Scripts update to run rubbos on compass4nfv env
JIRA: - Change-Id: Ic2b9f09d4d059e1db3b06abb5f36df2c06f4a8b8 Signed-off-by: QiLiang <liangqi1@huawei.com> (cherry picked from commit 44fa06d65eafdcfce9671bdc09f2c8a6d7115982)
Diffstat (limited to 'rubbos/rubbos_scripts/1-1-1/scripts')
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh4
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
index d1b8c165..565a5b70 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
@@ -18,7 +18,7 @@ ssh $BENCHMARK_HOST "
"
# run test rubbos.properties from 200 to 3200
-for i in {2..32..5}
+for i in {2..7..5}
do
echo "Start Browsing Only with rubbos.properties_$((100*i)) $(date)"
@@ -123,7 +123,7 @@ ls $RUBBOS_RESULTS_DIR_NAME
echo "Fetch POD env parameters"
source /tmp/vm_dev_setup/hosts.conf
-sed -i -e "s/REPLACE_POD_NAME/$POD_NAME/g" \
+sed -i -e "s/REPLACE_NODE_NAME/$NODE_NAME/g" \
-e "s/REPLACE_INSTALLER_TYPE/$INSTALLER_TYPE/g" \
-e "s/REPLACE_VERSION/$BOTTLENECKS_VERSION/g" \
-e "s#REPLACE_BOTTLENECKS_DB_TARGET#$BOTTLENECKS_DB_TARGET#g" \
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh b/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
index 692af416..6ecf4832 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
@@ -17,7 +17,7 @@ RELENG_REPO_DIR=/tmp/opnfvrepo/releng
INSTALLER_TYPE=fuel
INSTALLER_IP=10.20.0.2
-POD_NAME=opnfv-jump-2
+NODE_NAME=opnfv-jump-2
EXTERNAL_NET=net04_ext
echo "INFO: Creating openstack credentials .."
@@ -46,5 +46,5 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
fi
fi
-export EXTERNAL_NET INSTALLER_TYPE POD_NAME
+export EXTERNAL_NET INSTALLER_TYPE NODE_NAME
set +ex