diff options
| -rwxr-xr-x | rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh | 14 | ||||
| -rw-r--r-- | utils/dashboard/dashboard.yaml | 8 | ||||
| -rwxr-xr-x | utils/infra_setup/heat_template/HOT_create_instance.sh | 9 | ||||
| -rwxr-xr-x | utils/infra_setup/vm_dev_setup/setup_env.sh | 2 |
4 files changed, 26 insertions, 7 deletions
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh index 1c785b32..d1b8c165 100755 --- a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh +++ b/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh @@ -17,8 +17,8 @@ ssh $BENCHMARK_HOST " mkdir -p $TMP_RESULTS_DIR_BASE/$RUBBOS_RESULTS_DIR_NAME " -#TODO use for loop to genrate rubbos.properties file 200 ~ 1700 -for i in {2..17..5} +# 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)" @@ -121,6 +121,16 @@ 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_POD_NAME/$POD_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 diff --git a/utils/dashboard/dashboard.yaml b/utils/dashboard/dashboard.yaml index dbc9d8e6..56607701 100644 --- a/utils/dashboard/dashboard.yaml +++ b/utils/dashboard/dashboard.yaml @@ -1,6 +1,6 @@ --- -pod_name: unknown-pod -installer: fuel -version: unknown -target: http://127.0.0.1/results +pod_name: REPLACE_POD_NAME +installer: REPLACE_INSTALLER_TYPE +version: REPLACE_VERSION +target: http://REPLACE_BOTTLENECKS_DB_TARGET/results diff --git a/utils/infra_setup/heat_template/HOT_create_instance.sh b/utils/infra_setup/heat_template/HOT_create_instance.sh index bdcb7ef9..ec5b3666 100755 --- a/utils/infra_setup/heat_template/HOT_create_instance.sh +++ b/utils/infra_setup/heat_template/HOT_create_instance.sh @@ -167,6 +167,11 @@ bottlenecks_rubbos_run() echo "GERRIT_REFSPEC_DEBUG=$GERRIT_REFSPEC_DEBUG" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf + echo "POD_NAME=$POD_NAME" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf + echo "INSTALLER_TYPE=$INSTALLER_TYPE" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf + echo "BOTTLENECKS_VERSION=$BOTTLENECKS_VERSION" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf + echo "BOTTLENECKS_DB_TARGET=$BOTTLENECKS_DB_TARGET" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf + scp $ssh_args -r \ $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup \ ec2-user@$control_ip:/tmp @@ -255,6 +260,10 @@ main() TEMPLATE_NAME=bottlenecks_rubbos_hot.yaml PUBLIC_NET_NAME=net04_ext ssh_args="-o StrictHostKeyChecking=no -o BatchMode=yes -i $KEY_PATH/bottlenecks_key" + : ${POD_NAME:='opnfv-jump-2'} + : ${INSTALLER_TYPE:='fuel'} + : ${BOTTLENECKS_VERSION:='master'} + : ${BOTTLENECKS_DB_TARGET:='213.77.62.197'} bottlenecks_env_prepare set -x diff --git a/utils/infra_setup/vm_dev_setup/setup_env.sh b/utils/infra_setup/vm_dev_setup/setup_env.sh index 795a0a6a..7a69e83c 100755 --- a/utils/infra_setup/vm_dev_setup/setup_env.sh +++ b/utils/infra_setup/vm_dev_setup/setup_env.sh @@ -20,7 +20,7 @@ wait_vm_ok() { bottlenecks_prepare_env() { - echo "Bottlenecks prepare env in VMs" + echo "Bottlenecks prepare env" # configue rubbos control ssh key generate_ssh_key |