- Add timestamp
- Fix code pull bug
- Shoten test run time
JIRA: BOTTLENECK-24
Change-Id: Ie83fcf0e4a4ad2da715a694118f1f9e916a5f704
Signed-off-by: QiLiang <liangqi1@huawei.com>
(cherry picked from commit
6e490df0346e26f9e6cc5dc79029a03e1d17a454)
#ssh $CLIENT3_HOST "$RUBBOS_HOME/bench/flush_cache 490000" # remote client
#ssh $CLIENT4_HOST "$RUBBOS_HOME/bench/flush_cache 490000" # remote client
#ssh $CLIENT3_HOST "$RUBBOS_HOME/bench/flush_cache 490000" # remote client
#ssh $CLIENT4_HOST "$RUBBOS_HOME/bench/flush_cache 490000" # remote client
-RAMPUP=480000
-MI=720000
current_seconds=`date +%s`
start_seconds=`echo \( $RAMPUP / 1000 \) + $current_seconds - 60 | bc`
SMI=`date -d "1970-01-01 $start_seconds secs UTC" +%Y%m%d%H%M%S`
current_seconds=`date +%s`
start_seconds=`echo \( $RAMPUP / 1000 \) + $current_seconds - 60 | bc`
SMI=`date -d "1970-01-01 $start_seconds secs UTC" +%Y%m%d%H%M%S`
ssh $scp_options $host "sudo nice -n -1 $RUBBOS_APP/cpu_mem.sh $SMI $EMI" &
done
ssh $scp_options $host "sudo nice -n -1 $RUBBOS_APP/cpu_mem.sh $SMI $EMI" &
done
+echo "Rubbos emulator start $(date)"
+echo "Rubbos emulator end $(date)"
workload_use_tpcw_think_time = yes
workload_number_of_stories_per_page = 20
workload_use_tpcw_think_time = yes
workload_number_of_stories_per_page = 20
-workload_up_ramp_time_in_ms = 480000
+workload_up_ramp_time_in_ms = 48000
workload_up_ramp_slowdown_factor = 2
workload_up_ramp_slowdown_factor = 2
-workload_session_run_time_in_ms = 720000
-workload_down_ramp_time_in_ms = 30000
+workload_session_run_time_in_ms = 72000
+workload_down_ramp_time_in_ms = 3000
workload_down_ramp_slowdown_factor = 3
workload_percentage_of_author = 10
workload_down_ramp_slowdown_factor = 3
workload_percentage_of_author = 10
bottlenecks_env_prepare()
{
bottlenecks_env_prepare()
{
+ echo "Bottlenecks env prepare start $(date)"
+
if [ -d $BOTTLENECKS_REPO_DIR ]; then
rm -rf ${BOTTLENECKS_REPO_DIR}
fi
if [ -d $BOTTLENECKS_REPO_DIR ]; then
rm -rf ${BOTTLENECKS_REPO_DIR}
fi
source $BOTTLENECKS_REPO_DIR/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
chmod 600 $KEY_PATH/bottlenecks_key
source $BOTTLENECKS_REPO_DIR/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
chmod 600 $KEY_PATH/bottlenecks_key
+
+ echo "Bottlenecks env prepare end $(date)"
}
wait_heat_stack_complete() {
}
wait_heat_stack_complete() {
- if [ $BOTTLENECKS_DEBUG = True ]; then
+ #if [ $BOTTLENECKS_DEBUG = True ]; then
+ if false; then
heat stack-show bottlenecks
nova list | grep rubbos_
for i in $(nova list | grep rubbos_ | grep ERROR | awk '{print $2}')
heat stack-show bottlenecks
nova list | grep rubbos_
for i in $(nova list | grep rubbos_ | grep ERROR | awk '{print $2}')
bottlenecks_check_instance_ok()
{
bottlenecks_check_instance_ok()
{
+ echo "Bottlenecks check instance ok start $(date)"
wait_heat_stack_complete 120
wait_rubbos_control_ok 300
wait_heat_stack_complete 120
wait_rubbos_control_ok 300
+
+ echo "Bottlenecks check instance ok end $(date)"
}
bottlenecks_create_instance()
{
}
bottlenecks_create_instance()
{
- echo "create bottlenecks instance using heat template"
+ echo "Bottlenecks create instance using heat template start $(date)"
echo "upload keypair"
nova keypair-add --pub_key $KEY_PATH/bottlenecks_key.pub $KEY_NAME
echo "upload keypair"
nova keypair-add --pub_key $KEY_PATH/bottlenecks_key.pub $KEY_NAME
cd $HOT_PATH
heat stack-create bottlenecks -f ${TEMPLATE_NAME} \
-P "image=$IMAGE_NAME;key_name=$KEY_NAME;public_net=$PUBLIC_NET_NAME;flavor=$FLAVOR_NAME"
cd $HOT_PATH
heat stack-create bottlenecks -f ${TEMPLATE_NAME} \
-P "image=$IMAGE_NAME;key_name=$KEY_NAME;public_net=$PUBLIC_NET_NAME;flavor=$FLAVOR_NAME"
+
+ echo "Bottlenecks create instance using heat template end $(date)"
}
bottlenecks_rubbos_wait_finish()
}
bottlenecks_rubbos_wait_finish()
- ssh $ssh_args ec2-user@$control_ip "
- FILE=/tmp/rubbos_finished
- if [ -f \$FILE ]; then
- exit 0
- else
- exit 1
- fi
- "
+ ssh $ssh_args ec2-user@$control_ip "FILE=/tmp/rubbos_finished; if [ -f \$FILE ]; then exit 0; else exit 1; fi"
if [ $? = 0 ]; then
echo "Rubbos test case successfully finished :)"
return 0
if [ $? = 0 ]; then
echo "Rubbos test case successfully finished :)"
return 0
ssh $ssh_args \
ec2-user@$control_ip "bash /tmp/vm_dev_setup/setup_env.sh" &
ssh $ssh_args \
ec2-user@$control_ip "bash /tmp/vm_dev_setup/setup_env.sh" &
- bottlenecks_rubbos_wait_finish 240
+ bottlenecks_rubbos_wait_finish 80
rm -rf $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf
}
bottlenecks_cleanup()
{
rm -rf $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf
}
bottlenecks_cleanup()
{
- echo "clean up bottlenecks images and keys"
+ echo "Bottlenecks cleanup start $(date)"
if heat stack-list; then
for stack in $(heat stack-list | grep -e bottlenecks | awk '{print $2}'); do
if heat stack-list; then
for stack in $(heat stack-list | grep -e bottlenecks | awk '{print $2}'); do
nova flavor-delete $flavor || true
done
fi
nova flavor-delete $flavor || true
done
fi
+
+ echo "Bottlenecks cleanup end $(date)"
}
bottlenecks_load_bottlenecks_image()
{
}
bottlenecks_load_bottlenecks_image()
{
- echo "load bottlenecks image"
+ echo "Bottlenecks load image start $(date)"
curl --connect-timeout 10 -o /tmp/bottlenecks-trusty-server.img $IMAGE_URL -v
curl --connect-timeout 10 -o /tmp/bottlenecks-trusty-server.img $IMAGE_URL -v
- echo "bottlenecks image id: $IMAGE_ID_BOTTLENECKS"
+ echo "bottlenecks image end id: $IMAGE_ID_BOTTLENECKS $(date)"
- echo "create instances with heat template"
+ echo "main start $(date)"
BOTTLENECKS_DEBUG=True
BOTTLENECKS_REPO=https://gerrit.opnfv.org/gerrit/bottlenecks
BOTTLENECKS_DEBUG=True
BOTTLENECKS_REPO=https://gerrit.opnfv.org/gerrit/bottlenecks
ssh_args="-o StrictHostKeyChecking=no -o BatchMode=yes -i $KEY_PATH/bottlenecks_key"
bottlenecks_env_prepare
ssh_args="-o StrictHostKeyChecking=no -o BatchMode=yes -i $KEY_PATH/bottlenecks_key"
bottlenecks_env_prepare
bottlenecks_cleanup
bottlenecks_load_bottlenecks_image
bottlenecks_create_instance
bottlenecks_check_instance_ok
bottlenecks_rubbos_run
bottlenecks_cleanup
bottlenecks_cleanup
bottlenecks_load_bottlenecks_image
bottlenecks_create_instance
bottlenecks_check_instance_ok
bottlenecks_rubbos_run
bottlenecks_cleanup
+ echo "main end $(date)"
{
echo "Bottlenecks: download bottlenecks repo"
{
echo "Bottlenecks: download bottlenecks repo"
+ sudo git config --global http.sslVerify false
if [ -d $BOTTLENECKS_REPO_DIR/.git ]; then
cd $BOTTLENECKS_REPO_DIR
sudo git pull origin master
if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
if [ -d $BOTTLENECKS_REPO_DIR/.git ]; then
cd $BOTTLENECKS_REPO_DIR
sudo git pull origin master
if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
- sudo git fetch $BOTTLENECKS_REPO $GERRIT_REFSPEC_DEBUG && git checkout FETCH_HEAD
+ sudo git fetch $BOTTLENECKS_REPO $GERRIT_REFSPEC_DEBUG && sudo git checkout FETCH_HEAD
fi
cd -
else
sudo rm -rf $BOTTLENECKS_REPO_DIR
sudo git clone $BOTTLENECKS_REPO $BOTTLENECKS_REPO_DIR
if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
fi
cd -
else
sudo rm -rf $BOTTLENECKS_REPO_DIR
sudo git clone $BOTTLENECKS_REPO $BOTTLENECKS_REPO_DIR
if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
- sudo git fetch $BOTTLENECKS_REPO $GERRIT_REFSPEC_DEBUG && git checkout FETCH_HEAD
+ cd $BOTTLENECKS_REPO_DIR
+ echo "fetch $GERRIT_REFSPEC_DEBUG"
+ sudo git fetch $BOTTLENECKS_REPO $GERRIT_REFSPEC_DEBUG && sudo git checkout FETCH_HEAD
+ cd -
source $SCRIPT_DIR/common.sh
bottlenecks_prepare_env
source $SCRIPT_DIR/common.sh
bottlenecks_prepare_env
bottlenecks_download_repo
bottlenecks_config_hosts_ip
bottlenecks_download_packages
bottlenecks_download_repo
bottlenecks_config_hosts_ip
bottlenecks_download_packages