Merge "Add ACM db upgrade/downgrade to db-migrator"

[policy/docker.git] / csit / start-s3p-tests.sh

diff --git a/csit/start-s3p-tests.sh b/csit/start-s3p-tests.sh
index 100f57c..2e397eb 100755 (executable)
--- a/csit/start-s3p-tests.sh
+++ b/csit/start-s3p-tests.sh
@@ -23,7 +23,7 @@
 # Start Kubernetes
 function start_kubernetes() {
   bash run-k8s-csit.sh install
-  bash get-cluster-info.sh
+  bash resources/scripts/get-cluster-info.sh
 }
 
 function install_jmeter() {
@@ -40,32 +40,28 @@ function install_jmeter() {
   sudo apt install -y default-jdk
 
   # Install JMeter
-  curl -O https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-5.3.tgz
-  tar -xvf apache-jmeter-5.3.tgz
+  curl -O https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-5.6.2.tgz
+  tar -xvf apache-jmeter-5.6.2.tgz
+  mv apache-jmeter-5.6.2 apache-jmeter
+
+  # Define your desired heap size values
+  echo 'export JVM_ARGS="-Xms2g -Xmx4g"' > apache-jmeter/bin/setenv.sh
+  echo 'export HEAP="-Xms1G -Xmx2G -XX:MaxMetaspaceSize=512m"' >> apache-jmeter/bin/setenv.sh
+
 
   # Remove unnecessary files
-  rm -rf apache-jmeter-5.3/docs apache-jmeter-5.3/printable_docs
+  rm -rf apache-jmeter/docs apache-jmeter/printable_docs
 
   # Install CMD Runner
-  cd apache-jmeter-5.3/lib
+  cd apache-jmeter/lib
   curl -O https://repo1.maven.org/maven2/kg/apc/cmdrunner/2.2.1/cmdrunner-2.2.1.jar
 
-  # Install Plugin Manager
-  cd ext/
-  curl -O https://repo1.maven.org/maven2/kg/apc/jmeter-plugins-manager/1.6/jmeter-plugins-manager-1.6.jar
-
-  # Download Plugins
-  cd ..
-  java  -jar cmdrunner-2.2.1.jar --tool org.jmeterplugins.repository.PluginManagerCMD install-all-except jpgc-hadoop,jpgc-oauth,ulp-jmeter-autocorrelator-plugin,ulp-jmeter-videostreaming-plugin,ulp-jmeter-gwt-plugin,tilln-iso8583
-
   # Move JMeter to /opt
-  sudo cp -r ../../apache-jmeter-5.3 /opt/
+  sudo cp -r ../../apache-jmeter /opt/
 
   # Add JMeter Path Variable
-  nano .profile
-  JMETER_HOME="/opt/apache-jmeter-5.3"
-  PATH="$JMETER_HOME/bin:$PATH"
-  source ~/.profile
+  export JMETER_HOME="/opt/apache-jmeter"
+  export PATH="$JMETER_HOME/bin:$PATH"
 }
 
 function on_exit() {
@@ -107,7 +103,7 @@ then
   echo "Executing tests"
   echo "==========================="
   cd ${TESTDIR}/automate-performance || exit
-  nohup apache-jmeter-5.3/bin/jmeter -n -t $2 -l s3pTestResults.jtl
+  nohup jmeter -n -t $2 -l s3pTestResults.jtl
 
   # TODO: Generate report on on_exit()
 
@@ -117,5 +113,4 @@ then
   teardown
 else
   echo "Invalid arguments provided. Usage: $0 [option..] {run | uninstall}"
-fi
-
+fi
\ No newline at end of file