From ab5626438257df04e211cce06253778c37534206 Mon Sep 17 00:00:00 2001 From: QiLiang Date: Fri, 18 Dec 2015 10:51:25 +0000 Subject: Update package prepare scripts Remove apt-get install cmd, to shorten rubbos deploy time. The tested OS need install required packages before rubbos test run. JIRA: BOTTLENECK-24 Change-Id: Iac43fc7e8f08ccc4727c9eec65fa828aaf35c3c5 Signed-off-by: QiLiang --- rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh | 9 --------- rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh | 9 --------- rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh | 9 --------- rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh | 9 --------- rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh | 9 --------- rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh | 10 ---------- rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh | 12 ------------ rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh | 9 --------- rubbos/rubbos_scripts/1-1-1/scripts/run.sh | 3 ++- 9 files changed, 2 insertions(+), 77 deletions(-) (limited to 'rubbos/rubbos_scripts') 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 5f75fe7d..b24582f9 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 @@ -9,15 +9,6 @@ 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 " - apt-get update - apt-get install -y \ - gcc \ - gettext \ - g++ \ - make -" - 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 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 4de16d03..57a884d8 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 @@ -9,15 +9,6 @@ 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 " - apt-get update - apt-get install -y \ - gcc \ - gettext \ - g++ \ - make -" - 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 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 3d5ebde3..745bcbf9 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 @@ -9,15 +9,6 @@ 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 " - apt-get update - apt-get install -y \ - gcc \ - gettext \ - g++ \ - make -" - 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 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 c6e9d3d1..72b36228 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 @@ -9,15 +9,6 @@ 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 " - apt-get update - apt-get install -y \ - gcc \ - gettext \ - g++ \ - make -" - 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 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 84c82c21..0f4d99fe 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 @@ -9,15 +9,6 @@ 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 " - apt-get update - apt-get install -y \ - gcc \ - gettext \ - g++ \ - make -" - 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 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 c74b24d9..e2dc3e8d 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 @@ -11,16 +11,6 @@ scp $scp_options ../set_bottlenecks_rubbos_env.sh $HTTPD_HOST:/bottlenecks/rubbo ssh $HTTPD_HOST "mkdir -p $SOFTWARE_HOME" scp $scp_options $SOFTWARE_HOME/$HTTPD_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$HTTPD_TARBALL - -ssh $HTTPD_HOST " - apt-get update - apt-get install -y \ - gcc \ - gettext \ - g++ \ - make -" - 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 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 cd95eb8a..e9d02c14 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 @@ -10,22 +10,10 @@ 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 "echo 'nameserver 8.8.4.4' >> /etc/resolv.conf" 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 -ssh $MYSQL1_HOST " - apt-get update - apt-get install -y \ - gcc \ - gettext \ - g++ \ - libaio1 \ - libaio-dev \ - make -" - fi echo "MYSQL PREPARE DEPENDANT LIBRARY END" 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 ac5231e4..4fd7e9b1 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 @@ -11,15 +11,6 @@ scp $scp_options ../set_bottlenecks_rubbos_env.sh $TOMCAT1_HOST:/bottlenecks/rub ssh $TOMCAT1_HOST "mkdir -p $SOFTWARE_HOME" -ssh $TOMCAT1_HOST " - apt-get update - apt-get install -y \ - gcc \ - gettext \ - g++ \ - make -" - for i in $TOMCAT_TARBALL $JAVA_TARBALL $J2EE_TARBALL $ANT_TARBALL do scp $scp_options $SOFTWARE_HOME/$i $TOMCAT1_HOST:$SOFTWARE_HOME/$i diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh index e71c6ec2..ea9ab36e 100755 --- a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh +++ b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh @@ -114,7 +114,8 @@ do done ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_configure.sh -ssh $MYSQL1_HOST /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 -- cgit 1.2.3-korg