summaryrefslogtreecommitdiffstats
path: root/rubbos/rubbos_scripts/1-1-1/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'rubbos/rubbos_scripts/1-1-1/scripts')
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_configure.sh34
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh23
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh45
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh38
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_uninstall.sh18
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh15
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_configure.sh34
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh23
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh45
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh38
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh18
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_uninstall.sh15
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_configure.sh34
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh23
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh45
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh38
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_uninstall.sh18
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_uninstall.sh15
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_configure.sh34
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh23
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh45
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh38
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_uninstall.sh18
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_uninstall.sh15
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_configure.sh34
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh23
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh45
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh38
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_uninstall.sh18
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_uninstall.sh15
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CONTROL_checkScp_exec.sh28
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CONTROL_emulabConf_exec.sh63
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh151
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh25
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/HTTPD_ignition.sh19
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/HTTPD_install.sh44
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh50
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh34
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_uninstall.sh17
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/HTTPD_stop.sh20
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/HTTPD_uninstall.sh17
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh31
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_ignition.sh22
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh41
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh41
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_reset.sh49
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh34
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_uninstall.sh17
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_stop.sh20
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_uninstall.sh15
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_configure.sh18
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_ignition.sh19
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_install.sh28
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh59
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbosSL_configure.sh34
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh37
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_uninstall.sh19
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_stop.sh21
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_uninstall.sh16
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh19
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh50
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/kill_all.sh22
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/manualCleanup.sh84
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/reset_all.sh16
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/run.sh153
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/start_all.sh21
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/stop_all.sh18
67 files changed, 0 insertions, 2237 deletions
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_configure.sh
deleted file mode 100755
index 4c8c416a..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_configure.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "CONFIGURING RUBBOS CLIENT on $HOSTNAME"
-
-cp -r $WORK_HOME/rubbos_files/Client $RUBBOS_HOME/
-cp -r $WORK_HOME/rubbos_files/bench $RUBBOS_HOME/
-
-cp $OUTPUT_HOME/rubbos_conf/build.properties $RUBBOS_HOME/
-cp $OUTPUT_HOME/rubbos_conf/config.mk $RUBBOS_HOME/
-cp $OUTPUT_HOME/rubbos_conf/Makefile $RUBBOS_HOME/
-
-cp $OUTPUT_HOME/rubbos_conf/rubbos-servletsBO.sh $RUBBOS_HOME/bench/
-cp $OUTPUT_HOME/rubbos_conf/rubbos-servletsRW.sh $RUBBOS_HOME/bench/
-
-chmod ug+x $RUBBOS_HOME/bench/*.sh
-
-#build clients
-echo "COMPILING RUBBOS CLIENT on $HOSTNAME"
-cd $RUBBOS_HOME/Client
-make clean >/dev/null
-make >/dev/null 2>&1
-
-echo "DONE CONFIGURING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
deleted file mode 100755
index f516b061..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
-if [ ! -d "$RUBBOS_APP" ]; then
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-fi
-
-tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
-
-echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh
deleted file mode 100755
index 7e96fe81..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-. ../set_bottlenecks_rubbos_env.sh
-
-scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-
-# Packages for BENCHMARK rubbos install
-if true; then
-ssh $BENCHMARK_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
-scp $scp_options ../set_bottlenecks_rubbos_env.sh $BENCHMARK_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
-
-ssh $BENCHMARK_HOST "mkdir -p $SOFTWARE_HOME"
-scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $BENCHMARK_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
-scp $scp_options $SOFTWARE_HOME/flush_cache $BENCHMARK_HOST:$SOFTWARE_HOME/flush_cache
-scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $BENCHMARK_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
-ssh $BENCHMARK_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $BENCHMARK_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
-fi
-
-# Packages for BENCHMARK install
-if true; then
-scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $BENCHMARK_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
-fi
-
-# Packages for BENCHMARK configure
-if true; then
-ssh $BENCHMARK_HOST "mkdir -p $WORK_HOME/rubbos_files"
-scp $scp_options -r $WORK_HOME/rubbos_files/Client $BENCHMARK_HOST:$WORK_HOME/rubbos_files
-scp $scp_options -r $WORK_HOME/rubbos_files/bench $BENCHMARK_HOST:$WORK_HOME/rubbos_files
-ssh $BENCHMARK_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-for i in build.properties config.mk Makefile \
- rubbos-servletsBO.sh rubbos-servletsRW.sh
-do
- scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $BENCHMARK_HOST:$OUTPUT_HOME/rubbos_conf/$i
-done
-fi
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
deleted file mode 100755
index 6f2555aa..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
-
-if [ ! -d "$RUBBOS_APP" ]; then
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-fi
-
-# install RUBBoS
-tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
-#tar xzf $SOFTWARE_HOME/rubbos_html.tar.gz --directory=$RUBBOS_HOME/Servlet_HTML/
-cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
-
-# install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME >/dev/null
-make >/dev/null 2>&1
-sudo make install >/dev/null
-
-# install a script to collect statistics data
-cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
-chmod 755 $RUBBOS_APP/cpu_mem.sh
-
-echo "DONE INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_uninstall.sh
deleted file mode 100755
index 413ee958..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_uninstall.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-cd $SYSSTAT_HOME
-sudo make uninstall
-sudo rm -rf $SYSSTAT_HOME
-rm -rf $RUBBOS_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
deleted file mode 100755
index 36ecde18..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-rm -rf $JAVA_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_configure.sh
deleted file mode 100755
index 4c8c416a..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_configure.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "CONFIGURING RUBBOS CLIENT on $HOSTNAME"
-
-cp -r $WORK_HOME/rubbos_files/Client $RUBBOS_HOME/
-cp -r $WORK_HOME/rubbos_files/bench $RUBBOS_HOME/
-
-cp $OUTPUT_HOME/rubbos_conf/build.properties $RUBBOS_HOME/
-cp $OUTPUT_HOME/rubbos_conf/config.mk $RUBBOS_HOME/
-cp $OUTPUT_HOME/rubbos_conf/Makefile $RUBBOS_HOME/
-
-cp $OUTPUT_HOME/rubbos_conf/rubbos-servletsBO.sh $RUBBOS_HOME/bench/
-cp $OUTPUT_HOME/rubbos_conf/rubbos-servletsRW.sh $RUBBOS_HOME/bench/
-
-chmod ug+x $RUBBOS_HOME/bench/*.sh
-
-#build clients
-echo "COMPILING RUBBOS CLIENT on $HOSTNAME"
-cd $RUBBOS_HOME/Client
-make clean >/dev/null
-make >/dev/null 2>&1
-
-echo "DONE CONFIGURING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
deleted file mode 100755
index f516b061..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
-if [ ! -d "$RUBBOS_APP" ]; then
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-fi
-
-tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
-
-echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
deleted file mode 100755
index f73ff9fd..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-. ../set_bottlenecks_rubbos_env.sh
-
-scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-
-# Packages for CLIENT1 rubbos install
-if true; then
-ssh $CLIENT1_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
-scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT1_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
-
-ssh $CLIENT1_HOST "mkdir -p $SOFTWARE_HOME"
-scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT1_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
-scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT1_HOST:$SOFTWARE_HOME/flush_cache
-scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT1_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
-ssh $CLIENT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT1_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
-fi
-
-# Packages for CLIENT1 install
-if true; then
-scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT1_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
-fi
-
-# Packages for CLIENT1 configure
-if true; then
-ssh $CLIENT1_HOST "mkdir -p $WORK_HOME/rubbos_files"
-scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT1_HOST:$WORK_HOME/rubbos_files
-scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT1_HOST:$WORK_HOME/rubbos_files
-ssh $CLIENT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-for i in build.properties config.mk Makefile \
- rubbos-servletsBO.sh rubbos-servletsRW.sh
-do
- scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT1_HOST:$OUTPUT_HOME/rubbos_conf/$i
-done
-fi
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
deleted file mode 100755
index 6f2555aa..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
-
-if [ ! -d "$RUBBOS_APP" ]; then
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-fi
-
-# install RUBBoS
-tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
-#tar xzf $SOFTWARE_HOME/rubbos_html.tar.gz --directory=$RUBBOS_HOME/Servlet_HTML/
-cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
-
-# install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME >/dev/null
-make >/dev/null 2>&1
-sudo make install >/dev/null
-
-# install a script to collect statistics data
-cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
-chmod 755 $RUBBOS_APP/cpu_mem.sh
-
-echo "DONE INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
deleted file mode 100755
index 413ee958..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-cd $SYSSTAT_HOME
-sudo make uninstall
-sudo rm -rf $SYSSTAT_HOME
-rm -rf $RUBBOS_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_uninstall.sh
deleted file mode 100755
index 36ecde18..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_uninstall.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-rm -rf $JAVA_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_configure.sh
deleted file mode 100755
index 4c8c416a..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_configure.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "CONFIGURING RUBBOS CLIENT on $HOSTNAME"
-
-cp -r $WORK_HOME/rubbos_files/Client $RUBBOS_HOME/
-cp -r $WORK_HOME/rubbos_files/bench $RUBBOS_HOME/
-
-cp $OUTPUT_HOME/rubbos_conf/build.properties $RUBBOS_HOME/
-cp $OUTPUT_HOME/rubbos_conf/config.mk $RUBBOS_HOME/
-cp $OUTPUT_HOME/rubbos_conf/Makefile $RUBBOS_HOME/
-
-cp $OUTPUT_HOME/rubbos_conf/rubbos-servletsBO.sh $RUBBOS_HOME/bench/
-cp $OUTPUT_HOME/rubbos_conf/rubbos-servletsRW.sh $RUBBOS_HOME/bench/
-
-chmod ug+x $RUBBOS_HOME/bench/*.sh
-
-#build clients
-echo "COMPILING RUBBOS CLIENT on $HOSTNAME"
-cd $RUBBOS_HOME/Client
-make clean >/dev/null
-make >/dev/null 2>&1
-
-echo "DONE CONFIGURING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
deleted file mode 100755
index f516b061..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
-if [ ! -d "$RUBBOS_APP" ]; then
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-fi
-
-tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
-
-echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
deleted file mode 100755
index 7dfd60d9..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-. ../set_bottlenecks_rubbos_env.sh
-
-scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-
-# Packages for CLIENT2 rubbos install
-if true; then
-ssh $CLIENT2_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
-scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT2_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
-
-ssh $CLIENT2_HOST "mkdir -p $SOFTWARE_HOME"
-scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT2_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
-scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT2_HOST:$SOFTWARE_HOME/flush_cache
-scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT2_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
-ssh $CLIENT2_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT2_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
-fi
-
-# Packages for CLIENT2 install
-if true; then
-scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT2_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
-fi
-
-# Packages for CLIENT2 configure
-if true; then
-ssh $CLIENT2_HOST "mkdir -p $WORK_HOME/rubbos_files"
-scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT2_HOST:$WORK_HOME/rubbos_files
-scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT2_HOST:$WORK_HOME/rubbos_files
-ssh $CLIENT2_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-for i in build.properties config.mk Makefile \
- rubbos-servletsBO.sh rubbos-servletsRW.sh
-do
- scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT2_HOST:$OUTPUT_HOME/rubbos_conf/$i
-done
-fi
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
deleted file mode 100755
index 6f2555aa..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
-
-if [ ! -d "$RUBBOS_APP" ]; then
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-fi
-
-# install RUBBoS
-tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
-#tar xzf $SOFTWARE_HOME/rubbos_html.tar.gz --directory=$RUBBOS_HOME/Servlet_HTML/
-cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
-
-# install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME >/dev/null
-make >/dev/null 2>&1
-sudo make install >/dev/null
-
-# install a script to collect statistics data
-cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
-chmod 755 $RUBBOS_APP/cpu_mem.sh
-
-echo "DONE INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_uninstall.sh
deleted file mode 100755
index 413ee958..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_uninstall.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-cd $SYSSTAT_HOME
-sudo make uninstall
-sudo rm -rf $SYSSTAT_HOME
-rm -rf $RUBBOS_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_uninstall.sh
deleted file mode 100755
index 36ecde18..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_uninstall.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-rm -rf $JAVA_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_configure.sh
deleted file mode 100755
index 4c8c416a..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_configure.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "CONFIGURING RUBBOS CLIENT on $HOSTNAME"
-
-cp -r $WORK_HOME/rubbos_files/Client $RUBBOS_HOME/
-cp -r $WORK_HOME/rubbos_files/bench $RUBBOS_HOME/
-
-cp $OUTPUT_HOME/rubbos_conf/build.properties $RUBBOS_HOME/
-cp $OUTPUT_HOME/rubbos_conf/config.mk $RUBBOS_HOME/
-cp $OUTPUT_HOME/rubbos_conf/Makefile $RUBBOS_HOME/
-
-cp $OUTPUT_HOME/rubbos_conf/rubbos-servletsBO.sh $RUBBOS_HOME/bench/
-cp $OUTPUT_HOME/rubbos_conf/rubbos-servletsRW.sh $RUBBOS_HOME/bench/
-
-chmod ug+x $RUBBOS_HOME/bench/*.sh
-
-#build clients
-echo "COMPILING RUBBOS CLIENT on $HOSTNAME"
-cd $RUBBOS_HOME/Client
-make clean >/dev/null
-make >/dev/null 2>&1
-
-echo "DONE CONFIGURING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
deleted file mode 100755
index f516b061..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
-if [ ! -d "$RUBBOS_APP" ]; then
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-fi
-
-tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
-
-echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
deleted file mode 100755
index f958638f..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-. ../set_bottlenecks_rubbos_env.sh
-
-scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-
-# Packages for CLIENT3 rubbos install
-if true; then
-ssh $CLIENT3_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
-scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT3_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
-
-ssh $CLIENT3_HOST "mkdir -p $SOFTWARE_HOME"
-scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT3_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
-scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT3_HOST:$SOFTWARE_HOME/flush_cache
-scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT3_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
-ssh $CLIENT3_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT3_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
-fi
-
-# Packages for CLIENT3 install
-if true; then
-scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT3_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
-fi
-
-# Packages for CLIENT3 configure
-if true; then
-ssh $CLIENT3_HOST "mkdir -p $WORK_HOME/rubbos_files"
-scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT3_HOST:$WORK_HOME/rubbos_files
-scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT3_HOST:$WORK_HOME/rubbos_files
-ssh $CLIENT3_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-for i in build.properties config.mk Makefile \
- rubbos-servletsBO.sh rubbos-servletsRW.sh
-do
- scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT3_HOST:$OUTPUT_HOME/rubbos_conf/$i
-done
-fi
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
deleted file mode 100755
index 6f2555aa..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
-
-if [ ! -d "$RUBBOS_APP" ]; then
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-fi
-
-# install RUBBoS
-tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
-#tar xzf $SOFTWARE_HOME/rubbos_html.tar.gz --directory=$RUBBOS_HOME/Servlet_HTML/
-cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
-
-# install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME >/dev/null
-make >/dev/null 2>&1
-sudo make install >/dev/null
-
-# install a script to collect statistics data
-cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
-chmod 755 $RUBBOS_APP/cpu_mem.sh
-
-echo "DONE INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_uninstall.sh
deleted file mode 100755
index 413ee958..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_uninstall.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-cd $SYSSTAT_HOME
-sudo make uninstall
-sudo rm -rf $SYSSTAT_HOME
-rm -rf $RUBBOS_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_uninstall.sh
deleted file mode 100755
index 36ecde18..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_uninstall.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-rm -rf $JAVA_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_configure.sh
deleted file mode 100755
index 4c8c416a..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_configure.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "CONFIGURING RUBBOS CLIENT on $HOSTNAME"
-
-cp -r $WORK_HOME/rubbos_files/Client $RUBBOS_HOME/
-cp -r $WORK_HOME/rubbos_files/bench $RUBBOS_HOME/
-
-cp $OUTPUT_HOME/rubbos_conf/build.properties $RUBBOS_HOME/
-cp $OUTPUT_HOME/rubbos_conf/config.mk $RUBBOS_HOME/
-cp $OUTPUT_HOME/rubbos_conf/Makefile $RUBBOS_HOME/
-
-cp $OUTPUT_HOME/rubbos_conf/rubbos-servletsBO.sh $RUBBOS_HOME/bench/
-cp $OUTPUT_HOME/rubbos_conf/rubbos-servletsRW.sh $RUBBOS_HOME/bench/
-
-chmod ug+x $RUBBOS_HOME/bench/*.sh
-
-#build clients
-echo "COMPILING RUBBOS CLIENT on $HOSTNAME"
-cd $RUBBOS_HOME/Client
-make clean >/dev/null
-make >/dev/null 2>&1
-
-echo "DONE CONFIGURING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
deleted file mode 100755
index f516b061..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
-if [ ! -d "$RUBBOS_APP" ]; then
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-fi
-
-tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
-
-echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
deleted file mode 100755
index 5f218269..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-. ../set_bottlenecks_rubbos_env.sh
-
-scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-
-# Packages for CLIENT4 rubbos install
-if true; then
-ssh $CLIENT4_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
-scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT4_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
-
-ssh $CLIENT4_HOST "mkdir -p $SOFTWARE_HOME"
-scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT4_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
-scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT4_HOST:$SOFTWARE_HOME/flush_cache
-scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT4_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
-ssh $CLIENT4_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT4_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
-fi
-
-# Packages for CLIENT4 install
-if true; then
-scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT4_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
-fi
-
-# Packages for CLIENT4 configure
-if true; then
-ssh $CLIENT4_HOST "mkdir -p $WORK_HOME/rubbos_files"
-scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT4_HOST:$WORK_HOME/rubbos_files
-scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT4_HOST:$WORK_HOME/rubbos_files
-ssh $CLIENT4_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-for i in build.properties config.mk Makefile \
- rubbos-servletsBO.sh rubbos-servletsRW.sh
-do
- scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT4_HOST:$OUTPUT_HOME/rubbos_conf/$i
-done
-fi
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
deleted file mode 100755
index 6f2555aa..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
-
-if [ ! -d "$RUBBOS_APP" ]; then
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-fi
-
-# install RUBBoS
-tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
-#tar xzf $SOFTWARE_HOME/rubbos_html.tar.gz --directory=$RUBBOS_HOME/Servlet_HTML/
-cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
-
-# install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME >/dev/null
-make >/dev/null 2>&1
-sudo make install >/dev/null
-
-# install a script to collect statistics data
-cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
-chmod 755 $RUBBOS_APP/cpu_mem.sh
-
-echo "DONE INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_uninstall.sh
deleted file mode 100755
index 413ee958..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_uninstall.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-cd $SYSSTAT_HOME
-sudo make uninstall
-sudo rm -rf $SYSSTAT_HOME
-rm -rf $RUBBOS_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_uninstall.sh
deleted file mode 100755
index 36ecde18..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_uninstall.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-rm -rf $JAVA_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_checkScp_exec.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_checkScp_exec.sh
deleted file mode 100755
index 1cfb0bc7..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_checkScp_exec.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-# Check scp to all servers
-echo "*** checking scp to all servers *********************************"
-
-ssh -o StrictHostKeyChecking=no -o BatchMode=yes $CONTROL_HOST "hostname"
-ssh -o StrictHostKeyChecking=no -o BatchMode=yes $BENCHMARK_HOST "hostname"
-ssh -o StrictHostKeyChecking=no -o BatchMode=yes $CLIENT1_HOST "hostname"
-ssh -o StrictHostKeyChecking=no -o BatchMode=yes $CLIENT2_HOST "hostname"
-ssh -o StrictHostKeyChecking=no -o BatchMode=yes $CLIENT3_HOST "hostname"
-ssh -o StrictHostKeyChecking=no -o BatchMode=yes $CLIENT4_HOST "hostname"
-ssh -o StrictHostKeyChecking=no -o BatchMode=yes $HTTPD_HOST "hostname"
-ssh -o StrictHostKeyChecking=no -o BatchMode=yes $TOMCAT1_HOST "hostname"
-ssh -o StrictHostKeyChecking=no -o BatchMode=yes $MYSQL1_HOST "hostname"
-
-#ssh -o StrictHostKeyChecking=no -o BatchMode=yes bonn.cc.gt.atl.ga.us "hostname"
-ssh -o StrictHostKeyChecking=no -o BatchMode=yes localhost "hostname"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_emulabConf_exec.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_emulabConf_exec.sh
deleted file mode 100755
index 428172ab..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_emulabConf_exec.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-# Limit pc3000 Memory Capacity
-
-sleep 10
-
-# Make and mount new partiton
-echo "*** make FS on a partition and mount it *************************"
-
-for i in "$BENCHMARK_HOST" "$CLIENT1_HOST" "$CLIENT2_HOST" "$CLIENT3_HOST" "$CLIENT4_HOST" "$HTTPD_HOST" "$TOMCAT1_HOST" "$MYSQL1_HOST"
-do
-ssh $i "
- sudo mkdir -p $ELBA_TOP
- sudo chmod 777 $ELBA_TOP
-"
-scp $WORK_HOME/emulab_files/limits.conf $i:$ELBA_TOP
-scp $WORK_HOME/emulab_files/login $i:$ELBA_TOP
-scp $WORK_HOME/emulab_files/file-max $i:$ELBA_TOP
-
-ssh $i "
- sudo mv $ELBA_TOP/limits.conf /etc/security/
- sudo mv $ELBA_TOP/login /etc/pam.d/
-"
-done
-
-
-for i in "$BENCHMARK_HOST" "$CLIENT1_HOST" "$CLIENT2_HOST" "$CLIENT3_HOST" "$CLIENT4_HOST" "$HTTPD_HOST" "$TOMCAT1_HOST" "$MYSQL1_HOST"
-do
- ssh $i "
- sudo /sbin/mkfs /dev/sda4
- sudo mount /dev/sda4 $ELBA_TOP
- sudo chmod 777 $ELBA_TOP
- mkdir -p $RUBBOS_TOP
- sudo cp $SOFTWARE_HOME/sdparm-1.03.tgz /tmp
- cd /tmp
- sudo tar -zxvf ./sdparm-1.03.tgz
- cd sdparm-1.03
- sudo ./configure
- sudo make
- sudo make install
- sudo sdparm -c WCE /dev/sda
- " &
-done
-
-echo "sleep 420"
-sleep 420
-echo "wake up from sleeping 420"
-
-
-# Turning off Swap Partition
-
-sleep 10
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
deleted file mode 100755
index 77da6459..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-set -x
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-export scp_options='-o StrictHostKeyChecking=no -o BatchMode=yes'
-
-scp $WORK_HOME/monitors_files/oprofile_start.sh $MYSQL1_HOST:/tmp/
-
-echo "Starting RUBBoS"
-
-ssh $RUBBOS_RESULTS_HOST "
- mkdir -p $RUBBOS_RESULTS_DIR_BASE
-"
-ssh $BENCHMARK_HOST "
- mkdir -p $TMP_RESULTS_DIR_BASE/$RUBBOS_RESULTS_DIR_NAME
-"
-
-# run test rubbos.properties from 200 to 3200
-for i in {2..32..5}
-do
- echo "Start Browsing Only with rubbos.properties_$((100*i)) $(date)"
-
- ssh $BENCHMARK_HOST "
- source /bottlenecks/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
- rm -f $RUBBOS_HOME/Client/rubbos.properties
- "
-
- sed -e "s/REPLACE_HTTPD_HOST/$HTTPD_HOST/g" \
- -e "s/REPLACE_TOMCAT1_HOST/$TOMCAT1_HOST/g" \
- -e "s/REPLACE_MYSQL1_HOST/$MYSQL1_HOST/g" \
- -e "s#REPLACE_CLIENT1_HOST#$CLIENT1_HOST#g" \
- -e "s#REPLACE_CLIENT2_HOST#$CLIENT2_HOST#g" \
- -e "s#REPLACE_CLIENT3_HOST#$CLIENT3_HOST#g" \
- -e "s#REPLACE_CLIENT4_HOST#$CLIENT4_HOST#g" \
- -e "s/REPLACE_NUMBER_OF_CLIENTS_PER_NODE/$((20*i))/g" \
- $OUTPUT_HOME/rubbos_conf/rubbos.properties_template \
- > $OUTPUT_HOME/rubbos_conf/rubbos.properties
- scp $OUTPUT_HOME/rubbos_conf/rubbos.properties $BENCHMARK_HOST:$RUBBOS_HOME/Client/rubbos.properties
- rm -rf $OUTPUT_HOME/rubbos_conf/rubbos.properties
-
- echo "Resetting all data"
- $OUTPUT_HOME/scripts/reset_all.sh
-
- # Browsing Only
- echo "Start Browsing Only with rubbos.properties_$((100*i))"
- echo "Removing previous logs..."
- ssh $HTTPD_HOST "rm -f $HTTPD_HOME/logs/*log"
- ssh $TOMCAT1_HOST "rm -f $CATALINA_HOME/logs/*"
- ssh $MYSQL1_HOST "rm -f $MYSQL_HOME/run/*.log $RUBBOS_APP/mysql_mon-*"
-
- $OUTPUT_HOME/scripts/start_all.sh
- sleep 15
-
- for host in $BENCHMARK_HOST $CLIENT1_HOST $CLIENT2_HOST $CLIENT3_HOST \
- $CLIENT4_HOST $HTTPD_HOST $TOMCAT1_HOST $MYSQL1_HOST
- do
- ssh $host "rm -f $RUBBOS_APP/sar-* $RUBBOS_APP/ps-* $RUBBOS_APP/iostat-*"
- done
- ssh $MYSQL1_HOST "rm -f /tmp/*.log"
- ssh $MYSQL1_HOST chmod 777 /tmp/oprofile_start.sh
- #ssh $MYSQL1_HOST "
- # cd /tmp
- # ./oprofile_start.sh
- #" &
-
- ssh $BENCHMARK_HOST "
- set -x
- source /bottlenecks/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
-
- cd $RUBBOS_HOME/bench
- \rm -r 20*
-
- # Execute benchmark
- echo "execute benchmark"
- ./rubbos-servletsBO.sh
-
- # Collect results
- echo "The benchmark has finished. Now, collecting results..."
- cd 20*
- for host in $BENCHMARK_HOST $CLIENT1_HOST $CLIENT2_HOST $CLIENT3_HOST \
- $CLIENT4_HOST $HTTPD_HOST $TOMCAT1_HOST $MYSQL1_HOST
- do
- for f in 'sar-*' 'ps-*' 'iostat-*' 'mysql_mon-*' 'postgres_lock-*'
- do
- scp $scp_options \$host:$RUBBOS_APP/\$f ./
- done
- done
- cd ..
- find -type f
- find -type f | grep stat_client | xargs grep throughput
- mv 20* $TMP_RESULTS_DIR_BASE/$RUBBOS_RESULTS_DIR_NAME/
- "
-
- $OUTPUT_HOME/scripts/stop_all.sh
- $OUTPUT_HOME/scripts/kill_all.sh
- sleep 15
-
- echo "End Browsing Only with rubbos.properties_$((100*i)) $(date)"
-done
-
-echo "Processing the results..."
-ssh $BENCHMARK_HOST "
- cd $TMP_RESULTS_DIR_BASE
- #cd $RUBBOS_RESULTS_DIR_NAME
- #scp $RUBBOS_RESULTS_HOST:$RUBBOS_RESULTS_DIR_BASE/calc-sarSummary.prl ../
- #../calc-sarSummary.prl
-
- #rm -f 20*/*.bin
-
- #cd ../
- tar zcf $RUBBOS_RESULTS_DIR_NAME.tgz $RUBBOS_RESULTS_DIR_NAME
- scp $scp_options $RUBBOS_RESULTS_DIR_NAME.tgz $RUBBOS_RESULTS_HOST:$RUBBOS_RESULTS_DIR_BASE/
-"
-
-echo "Push the results to DB..."
-cd $RUBBOS_RESULTS_DIR_BASE
-
-ls $RUBBOS_RESULTS_DIR_NAME.tgz
-tar zxf $RUBBOS_RESULTS_DIR_NAME.tgz
-ls $RUBBOS_RESULTS_DIR_NAME
-
-echo "Fetch POD env parameters"
-source /tmp/vm_dev_setup/hosts.conf
-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" \
- $BOTTLENECKS_TOP/utils/dashboard/dashboard.yaml
-
-cat $BOTTLENECKS_TOP/utils/dashboard/dashboard.yaml
-
-python $BOTTLENECKS_TOP/utils/dashboard/process_data.py \
- $RUBBOS_RESULTS_DIR_BASE/$RUBBOS_RESULTS_DIR_NAME \
- $BOTTLENECKS_TOP/utils/dashboard/dashboard.yaml
-cd -
-
-echo "Finish RUBBoS"
-touch /tmp/rubbos_finished
-
-set +x
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh
deleted file mode 100755
index 2cacf966..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "CONFIGURING APACHE on $HOSTNAME"
-
-cp $OUTPUT_HOME/apache_conf/httpd.conf $HTTPD_HOME/conf/
-cp $OUTPUT_HOME/apache_conf/workers.properties $HTTPD_HOME/conf/
-cp -r $WORK_HOME/apache_files/rubbos_html $HTTPD_HOME/htdocs/rubbos
-
-apache > /dev/null 2>&1
-
-echo "APACHE CONFIGURED SUCCESSFULLY on $HOSTNAME"
-
-
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_ignition.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_ignition.sh
deleted file mode 100755
index 74850b65..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_ignition.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "STARTING APACHE on $HOSTNAME"
-
-$HTTPD_HOME/bin/apachectl -f $HTTPD_HOME/conf/httpd.conf -k start
-
-echo "APACHE IS RUNNING on $HOSTNAME"
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_install.sh
deleted file mode 100755
index 1370bc77..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_install.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING APACHE on $HOSTNAME"
-
-echo "Adding new user apache begin"
-useradd apache
-groupadd apache
-usermod -G apache apache
-echo "Adding new user apache end"
-
-mkdir -p $BOTTLENECKS_TOP
-chmod 755 $BOTTLENECKS_TOP
-mkdir -p $RUBBOS_TOP
-chmod 755 $RUBBOS_TOP
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-
-# apache
-tar zxf $SOFTWARE_HOME/$HTTPD_TARBALL --directory=$RUBBOS_APP
-cd $HTTPD_INSTALL_FILES
-./configure --prefix=$HTTPD_HOME --enable-module=so --enable-so --with-mpm=worker >/dev/null
-make >/dev/null
-make install >/dev/null
-
-# mod jk
-tar zxf $SOFTWARE_HOME/$MOD_JK_TARBALL --directory=$RUBBOS_APP
-tar zxf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
-cd $MOD_JK_INSTALL_CONFIGURE
-./configure --with-apxs=$HTTPD_HOME/bin/apxs --enable-jni --with-java-home=$JAVA_HOME >/dev/null
-make >/dev/null
-make install >/dev/null
-
-echo "APACHE IS INSTALLED on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
deleted file mode 100755
index 4dd116aa..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-. ../set_bottlenecks_rubbos_env.sh
-
-scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-
-# Packages for HTTPD install
-if true; then
-ssh $HTTPD_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
-scp $scp_options ../set_bottlenecks_rubbos_env.sh $HTTPD_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
-
-ssh $HTTPD_HOST "mkdir -p $SOFTWARE_HOME"
-scp $scp_options $SOFTWARE_HOME/$HTTPD_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$HTTPD_TARBALL
-scp $scp_options $SOFTWARE_HOME/$MOD_JK_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$MOD_JK_TARBALL
-scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
-
-fi
-
-# Packages for HTTPD rubbos install
-if true; then
-scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
-scp $scp_options $SOFTWARE_HOME/flush_cache $HTTPD_HOST:$SOFTWARE_HOME/flush_cache
-scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
-ssh $HTTPD_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $HTTPD_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
-fi
-
-# Packages for HTTPD configure
-if true; then
-ssh $HTTPD_HOST "mkdir -p $OUTPUT_HOME/apache_conf"
-scp $scp_options $OUTPUT_HOME/apache_conf/httpd.conf $HTTPD_HOST:$OUTPUT_HOME/apache_conf/httpd.conf
-
-sed -e "s/REPLACE_TOMCAT1_HOST/$TOMCAT1_HOST/g" \
- $OUTPUT_HOME/apache_conf/workers.properties_template \
- > $OUTPUT_HOME/apache_conf/workers.properties
-scp $scp_options $OUTPUT_HOME/apache_conf/workers.properties $HTTPD_HOST:$OUTPUT_HOME/apache_conf/workers.properties
-rm -rf $OUTPUT_HOME/apache_conf/workers.properties
-
-ssh $HTTPD_HOST "mkdir -p $WORK_HOME/apache_files"
-scp $scp_options -r $WORK_HOME/apache_files/rubbos_html $HTTPD_HOST:$WORK_HOME/apache_files/rubbos_html
-fi
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
deleted file mode 100755
index 29316c57..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
-
-mkdir -p $RUBBOS_APP
-
-# install RUBBoS
-tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
-cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
-
-# install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME >/dev/null
-make >/dev/null 2>&1
-sudo make install >/dev/null
-
-# install a script to collect statistics data
-cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
-chmod 755 $RUBBOS_APP/cpu_mem.sh
-
-echo "DONE INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_uninstall.sh
deleted file mode 100755
index 71cefa44..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_uninstall.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-cd $SYSSTAT_HOME
-sudo make uninstall
-sudo rm -rf $SYSSTAT_HOME
-rm -rf $RUBBOS_APP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_stop.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_stop.sh
deleted file mode 100755
index 515ecea2..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_stop.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "STOPPING APACHE on $HOSTNAME"
-
-$HTTPD_HOME/bin/apachectl -f $HTTPD_HOME/conf/httpd.conf -k stop
-
-echo "APACHE IS STOPPED on $HOSTNAME"
-
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_uninstall.sh
deleted file mode 100755
index 5f6cff8a..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_uninstall.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-rm -rf $HTTPD_INSTALL_FILES
-rm -rf $HTTPD_HOME
-
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
deleted file mode 100755
index d0ff01ab..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "CONFIGURING MYSQL on $HOSTNAME"
-
-cd $MYSQL_HOME
-chown -R mysql:mysql ./
-cp support-files/my-medium.cnf /etc/my.cnf
-#bin/mysqld_safe --user=$BOTTLENECKS_USER &
-#bin/mysqladmin -u root password 'new-password'
-cp support-files/mysql.server /etc/init.d/mysql.server
-/etc/init.d/mysql.server status
-
-if [ -f "/usr/local/bin/mysql" ]; then
-rm -rf /usr/local/bin/mysql
-fi
-
-ln -s $MYSQL_HOME/bin/mysql /usr/local/bin/mysql
-
-echo "DONE CONFIGURING MYSQL on $HOSTNAME"
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_ignition.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_ignition.sh
deleted file mode 100755
index 946f1007..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_ignition.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "STARTING MYSQL on $HOSTNAME $(date)"
-
-cd $MYSQL_HOME
-bin/mysqld_safe&
-sleep 10
-/etc/init.d/mysql.server status
-
-
-echo "MYSQL IS RUNNING on $HOSTNAME $(date)"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh
deleted file mode 100755
index b69cae88..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_install.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING MYSQL on $HOSTNAME"
-
-mkdir -p $BOTTLENECKS_TOP
-chmod 755 $BOTTLENECKS_TOP
-mkdir -p $RUBBOS_TOP
-chmod 755 $RUBBOS_TOP
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-
-cd /root
-groupadd mysql
-useradd -r -g mysql $BOTTLENECKS_USER
-tar xzf $SOFTWARE_HOME/$MYSQL_TARBALL --directory=$RUBBOS_APP
-cd /usr/local
-ln -s $MYSQL_HOME mysql
-cd mysql
-chown -R $BOTTLENECKS_USER .
-chgrp -R mysql .
-#scripts/mysql_install_db --verbose --user=$BOTTLENECKS_USER --basedir=$MYSQL_HOME --datadir=$MYSQL_DATA_DIR
-scripts/mysql_install_db --user=$BOTTLENECKS_USER
-chown -R root .
-chown -R $BOTTLENECKS_USER data
-
-#echo "begin install mysql"
-#cd $MYSQL_HOME
-#scripts/mysql_install_db --no-defaults --user=root --basedir=$MYSQL_HOME --port=$MYSQL_PORT --datadir=$MYSQL_DATA_DIR --log=$MYSQL_ERR_LOG --pid-file=$MYSQL_PID_FILE --socket=$MYSQL_SOCKET
-
-echo "DONE INSTALLING MYSQL on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
deleted file mode 100755
index cc714164..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-source ../set_bottlenecks_rubbos_env.sh
-
-scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-
-# Packages for MYSQL1 install
-echo "MYSQL PREPARE DEPENDANT LIBRARY BEGIN"
-if true; then
-ssh $MYSQL1_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
-scp $scp_options ../set_bottlenecks_rubbos_env.sh $MYSQL1_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
-
-ssh $MYSQL1_HOST "mkdir -p $SOFTWARE_HOME"
-scp $scp_options $SOFTWARE_HOME/$MYSQL_TARBALL $MYSQL1_HOST:$SOFTWARE_HOME/$MYSQL_TARBALL
-scp $scp_options $SOFTWARE_HOME/$RUBBOS_DATA_TARBALL $MYSQL1_HOST:$SOFTWARE_HOME/$RUBBOS_DATA_TARBALL
-
-fi
-echo "MYSQL PREPARE DEPENDANT LIBRARY END"
-
-# Packages for MYSQL1 rubbos install
-if true; then
-scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $MYSQL1_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
-scp $scp_options $SOFTWARE_HOME/flush_cache $MYSQL1_HOST:$SOFTWARE_HOME/flush_cache
-scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $MYSQL1_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
-ssh $MYSQL1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $MYSQL1_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
-fi
-
-# Packages for MYSQL1 configure
-if true; then
-scp $scp_options $SOFTWARE_HOME/$RUBBOS_DATA_TARBALL $MYSQL1_HOST:/tmp
-fi
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_reset.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_reset.sh
deleted file mode 100755
index da07ab36..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_reset.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "RESETING MYSQL on $HOSTNAME"
-# copy rubbos data files
-#tar xzf $RUBBOS_TOP/$RUBBOS_DATA_TARBALL --directory=$MYSQL_HOME/data/rubbos
-cd $MYSQL_HOME
-bin/mysqld_safe&
-sleep 10
-/etc/init.d/mysql.server status
-
-echo "BEGIN RUBBOS DATABASE GIVE PRIVILEGES"
-cat << EOF | mysql -uroot
-
-DROP DATABASE IF EXISTS rubbos;
-
-CREATE DATABASE rubbos;
-
-GRANT ALL PRIVILEGES ON rubbos.* TO 'rubbos'@'%' \
- IDENTIFIED BY 'rubbos';
- flush privileges;
-GRANT ALL PRIVILEGES ON rubbos.* TO 'rubbos'@'localhost' \
- IDENTIFIED BY 'rubbos';
- flush privileges;
-EOF
-echo "END RUBBOS DATABASE GIVE PRIVILEGES"
-
-echo "BEGIN IMPORT SQL DATA $(date)"
-echo "software_home=$SOFTWARE_HOME"
-tar xzf $SOFTWARE_HOME/$RUBBOS_DATA_TARBALL --directory /tmp
-mysql -uroot rubbos < /tmp/$RUBBOS_DATA_SQL
-echo "END IMPORT SQL DATA $(date)"
-rm /tmp/$RUBBOS_DATA_SQL
-
-bin/mysqladmin shutdown
-
-echo "DONE RESETING MYSQL on $HOSTNAME"
-sleep 5
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
deleted file mode 100755
index 96a47007..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
-
-mkdir -p $RUBBOS_APP
-
-# install RUBBoS
-tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
-#tar xzf $SOFTWARE_HOME/rubbos_html.tar.gz --directory=$RUBBOS_HOME/Servlet_HTML/
-cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
-
-# install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME >/dev/null
-make >/dev/null 2>&1
-sudo make install >/dev/null
-
-# install a script to collect statistics data
-cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
-chmod 755 $RUBBOS_APP/cpu_mem.sh
-
-echo "DONE INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_uninstall.sh
deleted file mode 100755
index d5db08a0..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_uninstall.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-cd $SYSSTAT_HOME
-sudo make uninstall
-sudo rm -rf $SYSSTAT_HOME
-rm -rf $RUBBOS_HOME
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_stop.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_stop.sh
deleted file mode 100755
index a41dfce8..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_stop.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "STOPPING MYSQL on $HOSTNAME"
-
-cd $MYSQL_HOME
-#bin/mysqladmin --socket=$MYSQL_SOCKET --user=root --password=$ROOT_PASSWORD shutdown
-bin/mysqladmin shutdown
-
-echo "MYSQL IS STOPPED on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_uninstall.sh
deleted file mode 100755
index 24aa4fbb..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_uninstall.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-rm -rf $MYSQL_HOME
-#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_configure.sh
deleted file mode 100755
index 604de026..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_configure.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "CONFIGURING TOMCAT on $HOSTNAME"
-
-cp $OUTPUT_HOME/tomcat_conf/server.xml $CATALINA_HOME/conf/server.xml
-
-echo "DONE CONFIGURING TOMCAT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_ignition.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_ignition.sh
deleted file mode 100755
index 88c62bec..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_ignition.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "STARTING TOMCAT on $HOSTNAME"
-
-cd $CATALINA_HOME/bin
-./startup.sh
-
-echo "TOMCAT IS RUNNING on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_install.sh
deleted file mode 100755
index ddd52081..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_install.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING TOMCAT on $HOSTNAME"
-
-mkdir -p $BOTTLENECKS_TOP
-chmod 755 $BOTTLENECKS_TOP
-mkdir -p $RUBBOS_TOP
-chmod 755 $RUBBOS_TOP
-mkdir -p $RUBBOS_APP
-chmod 755 $RUBBOS_APP
-
-tar xzf $SOFTWARE_HOME/$TOMCAT_TARBALL --directory=$RUBBOS_APP
-tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
-tar xzf $SOFTWARE_HOME/$J2EE_TARBALL --directory=$RUBBOS_APP
-tar xzf $SOFTWARE_HOME/$ANT_TARBALL --directory=$RUBBOS_APP
-
-echo "DONE INSTALLING TOMCAT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
deleted file mode 100755
index 7d01066f..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-. ../set_bottlenecks_rubbos_env.sh
-
-scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-
-# Packages for TOMCAT1 install
-if true; then
-ssh $TOMCAT1_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
-scp $scp_options ../set_bottlenecks_rubbos_env.sh $TOMCAT1_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
-
-ssh $TOMCAT1_HOST "mkdir -p $SOFTWARE_HOME"
-
-for i in $TOMCAT_TARBALL $JAVA_TARBALL $J2EE_TARBALL $ANT_TARBALL
-do
- scp $scp_options $SOFTWARE_HOME/$i $TOMCAT1_HOST:$SOFTWARE_HOME/$i
-done
-
-fi
-
-# Packages for TOMCAT1 rubbos install
-if true; then
-scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $TOMCAT1_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
-scp $scp_options $SOFTWARE_HOME/flush_cache $TOMCAT1_HOST:$SOFTWARE_HOME/flush_cache
-scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $TOMCAT1_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
-ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $TOMCAT1_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
-fi
-
-# Packages for TOMCAT1 configure
-if true; then
-ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/tomcat_conf"
-scp $scp_options $OUTPUT_HOME/tomcat_conf/server.xml $TOMCAT1_HOST:$OUTPUT_HOME/tomcat_conf/server.xml
-fi
-
-# Packages for TOMCAT1 rubbosSL configure
-if true; then
-ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
-sed -e "s#REPLACE_MYSQL1_HOST#$MYSQL1_HOST#g" \
- $OUTPUT_HOME/rubbos_conf/mysql.properties_template \
- > $OUTPUT_HOME/rubbos_conf/mysql.properties
-for i in build.properties mysql.properties build.xml Config.java web.xml
-do
- scp $scp_options $OUTPUT_HOME/rubbos_conf/$i $TOMCAT1_HOST:$OUTPUT_HOME/rubbos_conf/$i
-done
-rm -rf $OUTPUT_HOME/rubbos_conf/mysql.properties
-
-ssh $TOMCAT1_HOST "mkdir -p $WORK_HOME/rubbos_files"
-scp $scp_options -r $WORK_HOME/rubbos_files/Servlets $TOMCAT1_HOST:$WORK_HOME/rubbos_files/Servlets
-fi
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbosSL_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbosSL_configure.sh
deleted file mode 100755
index 764ae737..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbosSL_configure.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "CONFIGURING RUBBOS SERVLET on $HOSTNAME"
-
-\cp $OUTPUT_HOME/rubbos_conf/build.properties $RUBBOS_HOME/
-
-\cp -r $WORK_HOME/rubbos_files/Servlets $RUBBOS_HOME/
-\cp $OUTPUT_HOME/rubbos_conf/mysql.properties $RUBBOS_HOME/Servlets/
-\cp $OUTPUT_HOME/rubbos_conf/build.xml $RUBBOS_HOME/Servlets/
-\cp $OUTPUT_HOME/rubbos_conf/Config.java $RUBBOS_HOME/Servlets/edu/rice/rubbos/servlets/
-\cp $OUTPUT_HOME/rubbos_conf/web.xml $RUBBOS_HOME/Servlet_HTML/WEB-INF/
-
-cd $RUBBOS_HOME/Servlets/edu/rice/rubbos/servlets
-sed 's/public static final int BrowseCategoriesPoolSize = 6;/public static final int BrowseCategoriesPoolSize = 12;/g' Config.java > Config.java.tmp
-mv Config.java.tmp Config.java
-
-cd $RUBBOS_HOME/Servlets
-/bottlenecks/rubbos/app/apache-ant-1.6.5/bin/ant clean >/dev/null
-/bottlenecks/rubbos/app/apache-ant-1.6.5/bin/ant dist >/dev/null
-make >/dev/null 2>&1
-cp rubbos.war $CATALINA_HOME/webapps/
-
-echo "DONE CONFIGURING RUBBOS SERVLET on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
deleted file mode 100755
index e370cffa..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
-
-mkdir -p $RUBBOS_APP
-# install RUBBoS
-tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
-mkdir -p $RUBBOS_HOME/bench
-cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
-
-mkdir -p $SYSSTAT_HOME
-# install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME >/dev/null
-make >/dev/null 2>&1
-sudo make install >/dev/null
-
-# install a script to collect statistics data
-cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
-chmod 755 $RUBBOS_APP/cpu_mem.sh
-
-echo "DONE INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
-
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_uninstall.sh
deleted file mode 100755
index 75eb561c..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_uninstall.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-cd $SYSSTAT_HOME
-sudo make uninstall
-sudo rm -rf $SYSSTAT_HOME
-rm -rf $RUBBOS_HOME
-
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_stop.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_stop.sh
deleted file mode 100755
index 9e17d7c9..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_stop.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "STOPPING TOMCAT on $HOSTNAME"
-
-cd $CATALINA_HOME/bin
-./shutdown.sh
-
-echo "TOMCAT IS STOPPED on $HOSTNAME"
-
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_uninstall.sh
deleted file mode 100755
index 06bffaef..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_uninstall.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-rm -rf $CATALINA_HOME
-
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh b/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh
deleted file mode 100755
index 8434be82..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-#ssh_options=""
-
-ssh root@$TOMCAT1_HOST service tomcat status
-ssh root@$HTTPD_HOST service apache2 status
-ssh root@$MYSQL1_HOST service mysql status
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh b/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
deleted file mode 100755
index 6ecf4832..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-###############################################################################
-# Copyright (c) 2015 Huawei Tech.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-set -ex
-
-RELENG_REPO=https://gerrit.opnfv.org/gerrit/releng
-RELENG_REPO_DIR=/tmp/opnfvrepo/releng
-#RELENG_BRANCH=master # branch, tag, sha1 or refspec
-
-INSTALLER_TYPE=fuel
-INSTALLER_IP=10.20.0.2
-
-NODE_NAME=opnfv-jump-2
-EXTERNAL_NET=net04_ext
-
-echo "INFO: Creating openstack credentials .."
-
-if [ -d $RELENG_REPO_DIR ]; then
- rm -rf ${RELENG_REPO_DIR}
-fi
-mkdir -p ${RELENG_REPO_DIR}
-git config --global http.sslVerify false
-git clone ${RELENG_REPO} ${RELENG_REPO_DIR}
-
-# Create openstack credentials
-$RELENG_REPO_DIR/utils/fetch_os_creds.sh \
- -d /tmp/openrc \
- -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}
-
-source /tmp/openrc
-
-# FIXME: Temporary OPNFV playground hack
-if [ "$INSTALLER_TYPE" == "fuel" ]; then
- ssh_opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
- if sshpass -p r00tme ssh 2>/dev/null $ssh_opts root@${INSTALLER_IP} \
- fuel environment --env 1 | grep opnfv-virt; then
- echo "INFO: applying OPNFV playground hack"
- export OS_ENDPOINT_TYPE='publicURL'
- fi
-fi
-
-export EXTERNAL_NET INSTALLER_TYPE NODE_NAME
-set +ex
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/kill_all.sh b/rubbos/rubbos_scripts/1-1-1/scripts/kill_all.sh
deleted file mode 100755
index f91b73fd..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/kill_all.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-$OUTPUT_HOME/scripts/stop_all.sh
-
-for i in "$BENCHMARK_HOST" "$CLIENT1_HOST" "$CLIENT2_HOST" "$CLIENT3_HOST" "$CLIENT4_HOST" "$HTTPD_HOST" "$TOMCAT1_HOST" "$MYSQL1_HOST"
-do
- ssh $i "
- kill -9 -1
- "
-done
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/manualCleanup.sh b/rubbos/rubbos_scripts/1-1-1/scripts/manualCleanup.sh
deleted file mode 100755
index 94930eed..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/manualCleanup.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-echo "Uninstalling ...."
-
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_uninstall.sh
-ssh $CLIENT1_HOST /tmp/CLIENT1_uninstall.sh
-ssh $CLIENT2_HOST /tmp/CLIENT2_uninstall.sh
-ssh $CLIENT3_HOST /tmp/CLIENT3_uninstall.sh
-ssh $CLIENT4_HOST /tmp/CLIENT4_uninstall.sh
-ssh $HTTPD_HOST /tmp/HTTPD_uninstall.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_uninstall.sh
-ssh $MYSQL1_HOST /tmp/MYSQL1_uninstall.sh
-
-echo "Cleaning up ...."
-for i in "$BENCHMARK_HOST" "$CLIENT1_HOST" "$CLIENT2_HOST" "$CLIENT3_HOST" "$CLIENT4_HOST" "$HTTPD_HOST" "$TOMCAT1_HOST" "$MYSQL1_HOST"
-do
- ssh $i "
- sudo \rm -r $RUBBOS_TOP
- "
-done
-
-
-ssh $CONTROL_HOST rm -f /tmp/CONTROL_checkScp_exec.sh
-ssh $CONTROL_HOST rm -f /tmp/CONTROL_emulabConf_exec.sh
-ssh $CONTROL_HOST rm -f /tmp/CONTROL_rubbos_exec.sh
-ssh $BENCHMARK_HOST rm -f /tmp/BENCHMARK_rubbos_install.sh
-ssh $BENCHMARK_HOST rm -f /tmp/BENCHMARK_install.sh
-ssh $BENCHMARK_HOST rm -f /tmp/BENCHMARK_configure.sh
-ssh $BENCHMARK_HOST rm -f /tmp/BENCHMARK_uninstall.sh
-ssh $BENCHMARK_HOST rm -f /tmp/BENCHMARK_rubbos_uninstall.sh
-ssh $CLIENT1_HOST rm -f /tmp/CLIENT1_rubbos_install.sh
-ssh $CLIENT1_HOST rm -f /tmp/CLIENT1_install.sh
-ssh $CLIENT1_HOST rm -f /tmp/CLIENT1_configure.sh
-ssh $CLIENT1_HOST rm -f /tmp/CLIENT1_uninstall.sh
-ssh $CLIENT1_HOST rm -f /tmp/CLIENT1_rubbos_uninstall.sh
-ssh $CLIENT2_HOST rm -f /tmp/CLIENT2_rubbos_install.sh
-ssh $CLIENT2_HOST rm -f /tmp/CLIENT2_install.sh
-ssh $CLIENT2_HOST rm -f /tmp/CLIENT2_configure.sh
-ssh $CLIENT2_HOST rm -f /tmp/CLIENT2_uninstall.sh
-ssh $CLIENT2_HOST rm -f /tmp/CLIENT2_rubbos_uninstall.sh
-ssh $CLIENT3_HOST rm -f /tmp/CLIENT3_rubbos_install.sh
-ssh $CLIENT3_HOST rm -f /tmp/CLIENT3_install.sh
-ssh $CLIENT3_HOST rm -f /tmp/CLIENT3_configure.sh
-ssh $CLIENT3_HOST rm -f /tmp/CLIENT3_uninstall.sh
-ssh $CLIENT3_HOST rm -f /tmp/CLIENT3_rubbos_uninstall.sh
-ssh $CLIENT4_HOST rm -f /tmp/CLIENT4_rubbos_install.sh
-ssh $CLIENT4_HOST rm -f /tmp/CLIENT4_install.sh
-ssh $CLIENT4_HOST rm -f /tmp/CLIENT4_configure.sh
-ssh $CLIENT4_HOST rm -f /tmp/CLIENT4_uninstall.sh
-ssh $CLIENT4_HOST rm -f /tmp/CLIENT4_rubbos_uninstall.sh
-ssh $HTTPD_HOST rm -f /tmp/HTTPD_install.sh
-ssh $HTTPD_HOST rm -f /tmp/HTTPD_rubbos_install.sh
-ssh $HTTPD_HOST rm -f /tmp/HTTPD_configure.sh
-ssh $HTTPD_HOST rm -f /tmp/HTTPD_ignition.sh
-ssh $HTTPD_HOST rm -f /tmp/HTTPD_stop.sh
-ssh $HTTPD_HOST rm -f /tmp/HTTPD_rubbos_uninstall.sh
-ssh $HTTPD_HOST rm -f /tmp/HTTPD_uninstall.sh
-ssh $TOMCAT1_HOST rm -f /tmp/TOMCAT1_install.sh
-ssh $TOMCAT1_HOST rm -f /tmp/TOMCAT1_rubbos_install.sh
-ssh $TOMCAT1_HOST rm -f /tmp/TOMCAT1_configure.sh
-ssh $TOMCAT1_HOST rm -f /tmp/TOMCAT1_rubbosSL_configure.sh
-ssh $TOMCAT1_HOST rm -f /tmp/TOMCAT1_ignition.sh
-ssh $TOMCAT1_HOST rm -f /tmp/TOMCAT1_stop.sh
-ssh $TOMCAT1_HOST rm -f /tmp/TOMCAT1_rubbos_uninstall.sh
-ssh $TOMCAT1_HOST rm -f /tmp/TOMCAT1_uninstall.sh
-ssh $MYSQL1_HOST rm -f /tmp/MYSQL1_install.sh
-ssh $MYSQL1_HOST rm -f /tmp/MYSQL1_rubbos_install.sh
-ssh $MYSQL1_HOST rm -f /tmp/MYSQL1_configure.sh
-ssh $MYSQL1_HOST rm -f /tmp/MYSQL1_reset.sh
-ssh $MYSQL1_HOST rm -f /tmp/MYSQL1_ignition.sh
-ssh $MYSQL1_HOST rm -f /tmp/MYSQL1_stop.sh
-ssh $MYSQL1_HOST rm -f /tmp/MYSQL1_rubbos_uninstall.sh
-ssh $MYSQL1_HOST rm -f /tmp/MYSQL1_uninstall.sh
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/reset_all.sh b/rubbos/rubbos_scripts/1-1-1/scripts/reset_all.sh
deleted file mode 100755
index eeeab8b9..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/reset_all.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-ssh $MYSQL1_HOST /tmp/MYSQL1_reset.sh &
-sleep 120
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
deleted file mode 100755
index 47cec3ad..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-set -x
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1/scripts
-# Transfer all sub scripts to target hosts
-echo "*** scp scripts *************************************************"
-
-scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-
-scp $scp_options CONTROL_rubbos_exec.sh $CONTROL_HOST:/tmp
-
-if true; then
-for script in BENCHMARK_rubbos_install.sh BENCHMARK_install.sh \
- BENCHMARK_configure.sh BENCHMARK_uninstall.sh \
- BENCHMARK_rubbos_uninstall.sh
-do
- scp $scp_options $script $BENCHMARK_HOST:/tmp
-done
-fi
-
-if true; then
-for i in {1..4}
-do
- for script in CLIENT${i}_rubbos_install.sh CLIENT${i}_install.sh \
- CLIENT${i}_configure.sh CLIENT${i}_uninstall.sh \
- CLIENT${i}_rubbos_uninstall.sh
- do
- CLIENT_HOST=`printenv CLIENT${i}_HOST`
- scp $scp_options $script $CLIENT_HOST:/tmp
- done
-done
-fi
-
-if true; then
-for script in HTTPD_install.sh HTTPD_rubbos_install.sh \
- HTTPD_configure.sh HTTPD_ignition.sh \
- HTTPD_stop.sh HTTPD_rubbos_uninstall.sh \
- HTTPD_uninstall.sh
-do
- scp $scp_options $script $HTTPD_HOST:/tmp
-done
-fi
-
-if true; then
-for script in TOMCAT1_install.sh TOMCAT1_rubbos_install.sh \
- TOMCAT1_configure.sh TOMCAT1_rubbosSL_configure.sh \
- TOMCAT1_ignition.sh TOMCAT1_stop.sh \
- TOMCAT1_rubbos_uninstall.sh TOMCAT1_uninstall.sh
-do
- scp $scp_options $script $TOMCAT1_HOST:/tmp
-done
-fi
-
-if true; then
-for script in MYSQL1_install.sh MYSQL1_rubbos_install.sh \
- MYSQL1_configure.sh MYSQL1_reset.sh \
- MYSQL1_ignition.sh MYSQL1_stop.sh \
- MYSQL1_rubbos_uninstall.sh \
- MYSQL1_uninstall.sh
-do
- scp $scp_options $script $MYSQL1_HOST:/tmp
-done
-fi
-
-# Prepare software packages
-echo "*** prepare software packages ***"
-./MYSQL1_pkg_prepare.sh
-./TOMCAT1_pkg_prepare.sh
-./HTTPD_pkg_prepare.sh
-./BENCHMARK_pkg_prepare.sh
-for i in {1..4}
-do
- ./CLIENT${i}_pkg_prepare.sh
-done
-
-# Install and Configure and run Apache, Tomcat, CJDBC, and MySQL
-echo "*** install scripts & configure & execute ***********************"
-
-ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_install.sh
-ssh $MYSQL1_HOST /tmp/MYSQL1_install.sh
-
-ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_install.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_install.sh
-
-ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_install.sh
-ssh $HTTPD_HOST /tmp/HTTPD_install.sh
-
-ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_rubbos_install.sh
-ssh $MYSQL1_HOST /tmp/MYSQL1_rubbos_install.sh
-
-ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_rubbos_install.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbos_install.sh
-
-ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_rubbos_install.sh
-ssh $HTTPD_HOST /tmp/HTTPD_rubbos_install.sh
-
-ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_rubbos_install.sh
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_rubbos_install.sh
-
-for i in {1..4}
-do
- CLIENT_HOST=`printenv CLIENT${i}_HOST`
- ssh root@$CLIENT_HOST chmod 770 /tmp/CLIENT${i}_rubbos_install.sh
- ssh $CLIENT_HOST /tmp/CLIENT${i}_rubbos_install.sh
-done
-
-ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_install.sh
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_install.sh
-
-for i in {1..4}
-do
- CLIENT_HOST=`printenv CLIENT${i}_HOST`
- ssh root@$CLIENT_HOST chmod 770 /tmp/CLIENT${i}_install.sh
- ssh $CLIENT_HOST /tmp/CLIENT${i}_install.sh
-done
-
-ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_configure.sh
-ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh &
-sleep 60
-
-ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_configure.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_configure.sh
-
-ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_configure.sh
-ssh $HTTPD_HOST /tmp/HTTPD_configure.sh
-
-ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_configure.sh
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_configure.sh
-
-for i in {1..4}
-do
- CLIENT_HOST=`printenv CLIENT${i}_HOST`
- ssh root@$CLIENT_HOST chmod 770 /tmp/CLIENT${i}_configure.sh
- ssh $CLIENT_HOST /tmp/CLIENT${i}_configure.sh
-done
-
-ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_rubbosSL_configure.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_configure.sh
-
-ssh $CONTROL_HOST /tmp/CONTROL_rubbos_exec.sh
-
-set +x
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/start_all.sh b/rubbos/rubbos_scripts/1-1-1/scripts/start_all.sh
deleted file mode 100755
index e47b54d3..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/start_all.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-ssh $MYSQL1_HOST /tmp/MYSQL1_ignition.sh &
-sleep 20
-
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_ignition.sh
-sleep 10
-
-ssh $HTTPD_HOST /tmp/HTTPD_ignition.sh
-sleep 5
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/stop_all.sh b/rubbos/rubbos_scripts/1-1-1/scripts/stop_all.sh
deleted file mode 100755
index 8e57b2b2..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/stop_all.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
-source set_bottlenecks_rubbos_env.sh
-
-ssh $HTTPD_HOST /tmp/HTTPD_stop.sh
-
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_stop.sh
-
-ssh $MYSQL1_HOST /tmp/MYSQL1_stop.sh