diff --git a/.github/workflows/scalability.yml b/.github/workflows/scalability.yml index c15cee81dbf..36f35aeafe5 100644 --- a/.github/workflows/scalability.yml +++ b/.github/workflows/scalability.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Set TAG_NAME var - run: echo "::set-env name=TAG_NAME::${GITHUB_REF#refs/tags/}" + run: echo "TAG_NAME=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v2 - name: Configure AWS Credentials diff --git a/tests/scalability/run_suite.sh b/tests/scalability/run_suite.sh index 26d3e3d6919..e60570981b0 100755 --- a/tests/scalability/run_suite.sh +++ b/tests/scalability/run_suite.sh @@ -9,22 +9,22 @@ export NODE_TLS_REJECT_UNAUTHORIZED=0 sudo apt-get update echo installing JAVA -sudo apt-get -q install default-jre -y +sudo apt-get install default-jre -y echo installing node curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - -sudo apt-get -q install -y nodejs +sudo apt-get install -y nodejs echo "Changing config to match url arg" node -p "const fs = require('fs');var path = './config.json';var config = JSON.stringify({...require(path), url: '$MEDIC_URL/medic'}, null, 2);fs.writeFileSync(path,config,{encoding:'utf8',flag:'w'});" echo "npm install for jmeter suite" npm install echo "jmeter install" -wget http://www.gtlib.gatech.edu/pub/apache//jmeter/binaries/apache-jmeter-5.3.tgz -q && -mkdir ./jmeter && tar -xf apache-jmeter-5.3.tgz -C ./jmeter --strip-components=1 +wget https://apache.claz.org//jmeter/binaries/apache-jmeter-5.4.1.tgz -O ./apache-jmeter.tgz && +mkdir ./jmeter && tar -xf apache-jmeter.tgz -C ./jmeter --strip-components=1 echo "Installing Plugins" && -wget https://repo1.maven.org/maven2/kg/apc/jmeter-plugins-manager/1.4/jmeter-plugins-manager-1.4.jar -O ./jmeter/lib/ext/jmeter-plugins-manager-1.4.jar -q && -wget 'http://search.maven.org/remotecontent?filepath=kg/apc/cmdrunner/2.2/cmdrunner-2.2.jar' -O ./jmeter/lib/cmdrunner-2.2.jar -q && +wget https://repo1.maven.org/maven2/kg/apc/jmeter-plugins-manager/1.4/jmeter-plugins-manager-1.4.jar -O ./jmeter/lib/ext/jmeter-plugins-manager-1.4.jar && +wget 'http://search.maven.org/remotecontent?filepath=kg/apc/cmdrunner/2.2/cmdrunner-2.2.jar' -O ./jmeter/lib/cmdrunner-2.2.jar && java -cp jmeter/lib/ext/jmeter-plugins-manager-1.4.jar org.jmeterplugins.repository.PluginManagerCMDInstaller && ./jmeter/bin/PluginsManagerCMD.sh install jpgc-mergeresults && echo "jmeter do it!" diff --git a/tests/scalability/start_ec2_medic.sh b/tests/scalability/start_ec2_medic.sh index 57584f36444..0abda98b077 100755 --- a/tests/scalability/start_ec2_medic.sh +++ b/tests/scalability/start_ec2_medic.sh @@ -33,7 +33,7 @@ fi url=https://$PublicDnsName -echo "::set-env name=MEDIC_URL::$url" +echo "{MEDIC_URL}={$url}" >> $GITHUB_ENV echo Begin Checking $url/api/info is up version=$(curl -s $url/api/info -k | jq .version -r)