Merge branch 'develop'

install.sh

@@ -12,8 +12,9 @@ JMETER_VERSION=$3
 
 
 function install_jmeter_plugins() {
-    wget -q -O $REMOTE_HOME/JMeterPlugins-Extras-1.3.1.jar https://s3.amazonaws.com/jmeter-ec2/JMeterPlugins-Extras-1.3.1.jar
-    mv $REMOTE_HOME/JMeterPlugins-Extras-1.3.1.jar $REMOTE_HOME/$JMETER_VERSION/lib/ext/
+    wget -q -O $REMOTE_HOME/JMeterPlugins-Extras.jar https://s3.amazonaws.com/jmeter-ec2/JMeterPlugins-Extras.jar
+    wget -q -O $REMOTE_HOME/JMeterPlugins-Standard.jar https://s3.amazonaws.com/jmeter-ec2/JMeterPlugins-Standard.jar
+    mv $REMOTE_HOME/JMeterPlugins*.jar $REMOTE_HOME/$JMETER_VERSION/lib/ext/
 }
 
 function install_mysql_driver() {

jmeter-ec2.properties

@@ -29,8 +29,6 @@ RUNNINGTOTAL_INTERVAL="3"                   # How often the script prints runnin
 ELASTIC_IPS=""                              # A list of static IPs that can be assigned to each ec2 host. Ignored if not set.
 REMOTE_PORT="22"                            # The port number sshd is running on,
 JMETER_VERSION="apache-jmeter-2.13"          # The version of JMeter to be used. Must be the full name used in the dir structure. Does not work for versions prior to 2.5.1.
-JAVA_VERSION_32='jre-6u32-linux-i586.bin'   # Specify the JAVA binary you will be using in the case of 32Bit.
-JAVA_VERSION_64='jre-6u32-linux-x64.bin'    # Specify the JAVA binary you will be using in the case of 64Bit.
 
 
 #

jmeter-ec2.properties.vagrant

@@ -14,8 +14,6 @@ USER="vagrant"                               # Should match the AMI
 REMOTE_PORT="2222"                            # The port number sshd is running on,
 RUNNINGTOTAL_INTERVAL="3"                   # How often the script prints running totals to the screen (n * summariser.interval seconds)
 JMETER_VERSION="apache-jmeter-2.7"          # The version of JMeter to be used. Must be the full name used in the dir structure. Does not work for versions prior to 2.5.1.
-JAVA_VERSION_32='jre-6u32-linux-i586.bin'   # Specify the JAVA binary you will be using in the case of 32Bit.
-JAVA_VERSION_64='jre-6u32-linux-x64.bin'    # Specify the JAVA binary you will be using in the case of 64Bit.
 RUNNINGTOTAL_INTERVAL="3"                   # How often the script prints running totals to the screen (n * summariser.interval seconds)
 
 # REMOTE_HOSTS

jmeter-ec2.sh

@@ -3,7 +3,6 @@
 # ========================================================================================
 # jmeter-ec2.sh
 # https://github.com/oliverlloyd/jmeter-ec2
-# http://www.http503.com/2012/run-jmeter-on-amazon-ec2-cloud/
 # ========================================================================================
 #
 # Copyright 2012 - Oliver Lloyd - GNU GENERAL PUBLIC LICENSE
@@ -268,7 +267,7 @@ function runsetup() {
 
     # wait for each instance to be fully operational
     status_check_count=0
-    status_check_limit=90
+    status_check_limit=270
     status_check_limit=`echo "$status_check_limit + $countof_instanceids" | bc` # increase wait time based on instance count
     echo "waiting for instance status checks to pass (this can take several minutes)..."
     count_passed=0
@@ -413,7 +412,7 @@ function runsetup() {
                     $LOCAL_HOME/install.sh \
                     $LOCAL_HOME/jmeter-ec2.properties \
                     $USER@$host:$REMOTE_HOME \
-                    && echo "done" > $project_home/$DATETIME-$host-scpinstall.out)
+                    && echo "done" > $project_home/$DATETIME-$host-scpinstall.out) &  
     done
 
     # check to see if the scp call is complete (could just use the wait command here...)
@@ -422,8 +421,10 @@ function runsetup() {
     do
         # Update progress bar
         progressBar $instance_count $res
-        res=$(grep -c "done" $project_home/$DATETIME*scpinstall.out \
-            | awk -F: '{ s+=$NF } END { print s }') # the awk command here sums up the output if multiple matches were found
+        # Count how many out files we have for the copy (if the file exists the copy completed)
+        # Note. We send stderr to dev/null in the ls cmd below to prevent file not found errors filling the screen
+        # and the sed command here trims whitespace
+        res=$(ls -l $project_home/$DATETIME*scpinstall.out 2>/dev/null | wc -l | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
         sleep 1
     done
     progressBar $instance_count $res true