Skip to content

Commit

Permalink
Update set env (#7063) (#7064)
Browse files Browse the repository at this point in the history
* updated to use new way for env vars in github actions removed the quiet for logging and updated the jmeter version
  • Loading branch information
newtewt authored Apr 15, 2021
1 parent aa9efbd commit 3ba1554
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scalability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions tests/scalability/run_suite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand Down
2 changes: 1 addition & 1 deletion tests/scalability/start_ec2_medic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 3ba1554

Please sign in to comment.