summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Li <matthew.lijun@huawei.com>2015-12-17 02:18:07 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-17 02:18:07 +0000
commit0824983484f058a0a382d7ae1b193a6c48db770e (patch)
treeb6fa763a28000ae5113ea8eee41d2382ad31fb5b
parent25982d8736e103682a5e07b91e85b5be5b801ca0 (diff)
parentbbf956244bc9dcb834a69d784a4cd2a64a5989a8 (diff)
Merge "Sysstat install bug fix"
Diffstat
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh1
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh10
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh1
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh10
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh1
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh10
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh1
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh10
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh1
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh10
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh1
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh11
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh1
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh10
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh1
-rwxr-xr-xrubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh8
16 files changed, 48 insertions, 39 deletions
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
index f0614585..5f75fe7d 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh
@@ -13,6 +13,7 @@ ssh $BENCHMARK_HOST "
apt-get update
apt-get install -y \
gcc \
+ gettext \
g++ \
make
"
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
index d78ebd28..098df714 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
@@ -16,12 +16,12 @@ 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
+tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-#cd $SYSSTAT_HOME
-#./configure --prefix=$SYSSTAT_HOME
-#make
-#sudo make install
+cd $SYSSTAT_HOME
+./configure --prefix=$SYSSTAT_HOME
+make
+sudo make install
# install a script to collect statistics data
cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
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
index 2595cc41..4de16d03 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
@@ -13,6 +13,7 @@ ssh $CLIENT1_HOST "
apt-get update
apt-get install -y \
gcc \
+ gettext \
g++ \
make
"
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
index d78ebd28..098df714 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
@@ -16,12 +16,12 @@ 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
+tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-#cd $SYSSTAT_HOME
-#./configure --prefix=$SYSSTAT_HOME
-#make
-#sudo make install
+cd $SYSSTAT_HOME
+./configure --prefix=$SYSSTAT_HOME
+make
+sudo make install
# install a script to collect statistics data
cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
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
index 8e80316c..3d5ebde3 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
@@ -13,6 +13,7 @@ ssh $CLIENT2_HOST "
apt-get update
apt-get install -y \
gcc \
+ gettext \
g++ \
make
"
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
index d78ebd28..098df714 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
@@ -16,12 +16,12 @@ 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
+tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-#cd $SYSSTAT_HOME
-#./configure --prefix=$SYSSTAT_HOME
-#make
-#sudo make install
+cd $SYSSTAT_HOME
+./configure --prefix=$SYSSTAT_HOME
+make
+sudo make install
# install a script to collect statistics data
cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
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
index 3bd56940..c6e9d3d1 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
@@ -13,6 +13,7 @@ ssh $CLIENT3_HOST "
apt-get update
apt-get install -y \
gcc \
+ gettext \
g++ \
make
"
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
index d78ebd28..098df714 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
@@ -16,12 +16,12 @@ 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
+tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-#cd $SYSSTAT_HOME
-#./configure --prefix=$SYSSTAT_HOME
-#make
-#sudo make install
+cd $SYSSTAT_HOME
+./configure --prefix=$SYSSTAT_HOME
+make
+sudo make install
# install a script to collect statistics data
cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
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
index 4d8ae9aa..84c82c21 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
@@ -13,6 +13,7 @@ ssh $CLIENT4_HOST "
apt-get update
apt-get install -y \
gcc \
+ gettext \
g++ \
make
"
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
index d78ebd28..098df714 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
@@ -16,12 +16,12 @@ 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
+tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-#cd $SYSSTAT_HOME
-#./configure --prefix=$SYSSTAT_HOME
-#make
-#sudo make install
+cd $SYSSTAT_HOME
+./configure --prefix=$SYSSTAT_HOME
+make
+sudo make install
# install a script to collect statistics data
cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
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
index c09860a1..c74b24d9 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
@@ -16,6 +16,7 @@ ssh $HTTPD_HOST "
apt-get update
apt-get install -y \
gcc \
+ gettext \
g++ \
make
"
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
index 48dc2310..667a5d10 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
@@ -12,11 +12,12 @@ 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
-#make
-#sudo make install
+tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+
+cd $SYSSTAT_HOME
+./configure --prefix=$SYSSTAT_HOME
+make
+sudo make install
# install a script to collect statistics data
cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
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
index 17b5e745..79cf6e2f 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
@@ -16,6 +16,7 @@ ssh $MYSQL1_HOST "
apt-get update
apt-get install -y \
gcc \
+ gettext \
g++ \
libaio1 \
libaio-dev \
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
index 42a75676..6014d22d 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
@@ -13,11 +13,11 @@ 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
-#make
-#sudo make install
+tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+cd $SYSSTAT_HOME
+./configure --prefix=$SYSSTAT_HOME
+make
+sudo make install
# install a script to collect statistics data
cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
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
index 9e0783c5..ac5231e4 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
@@ -15,6 +15,7 @@ ssh $TOMCAT1_HOST "
apt-get update
apt-get install -y \
gcc \
+ gettext \
g++ \
make
"
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
index 26c0ae2c..1027cc71 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
@@ -15,10 +15,10 @@ mkdir -p $SYSSTAT_HOME
# install sysstat
tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-#cd $SYSSTAT_HOME
-#./configure --prefix=$SYSSTAT_HOME
-#make
-#sudo make install
+cd $SYSSTAT_HOME
+./configure --prefix=$SYSSTAT_HOME
+make
+sudo make install
# install a script to collect statistics data
cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.