Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ jobs:
- name: MATLAB Web App Server Reference Architecture Health Check Test Ubuntu Existing VPC Ubuntu us-east-1 region
run: |
cd healthcheck
python test_mwasrefarch_healthcheck_newvpc.py ${{ secrets.OIDCKeyPairNameVirginia }} ${{ secrets.lmpassword }} ${{ secrets.ipaddress }} "us-east-1" "Ubuntu"
python test_mwasrefarch_healthcheck_newvpc.py ${{ secrets.OIDCKeyPairNameVirginia }} ${{ secrets.lmpassword }} "us-east-1" "Ubuntu"
2 changes: 1 addition & 1 deletion .github/workflows/healthcheck-app-existingVpc-Win-Tue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ jobs:
- name: MATLAB Web App Server Reference Architecture Health Check Test Windows Existing VPC Windows eu-west-1 region
run: |
cd healthcheck
python test_webappserver_refarch_existingvpc.py ${{ secrets.OIDCKeyPairNameIreland }} ${{ secrets.lmpassword }} ${{ secrets.ipaddress }} "eu-west-1" "Windows"
python test_webappserver_refarch_existingvpc.py ${{ secrets.OIDCKeyPairNameIreland }} ${{ secrets.lmpassword }} "eu-west-1" "Windows"
2 changes: 1 addition & 1 deletion .github/workflows/healthcheck-app-newVpc-Ubuntu-Mon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ jobs:
- name: MATLAB Web App Server Reference Architecture Health Check Test Ubuntu New VPC Ubuntu us-east-1 region
run: |
cd healthcheck
python test_mwasrefarch_healthcheck_newvpc.py ${{ secrets.OIDCKeyPairNameVirginia }} ${{ secrets.lmpassword }} ${{ secrets.ipaddress }} "us-east-1" "Ubuntu"
python test_mwasrefarch_healthcheck_newvpc.py ${{ secrets.OIDCKeyPairNameVirginia }} ${{ secrets.lmpassword }} "us-east-1" "Ubuntu"
2 changes: 1 addition & 1 deletion .github/workflows/healthcheck-app-newVpc-Win-Wed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ jobs:
- name: MATLAB Web App Server Reference Architecture Health Check Test Windows New VPC Windows ap-northeast region
run: |
cd healthcheck
python test_mwasrefarch_healthcheck_newvpc.py ${{ secrets.OIDCKeyPairNameTokyo }} ${{ secrets.lmpassword }} ${{ secrets.ipaddress }} "ap-northeast-1" "Windows"
python test_mwasrefarch_healthcheck_newvpc.py ${{ secrets.OIDCKeyPairNameTokyo }} ${{ secrets.lmpassword }} "ap-northeast-1" "Windows"
5 changes: 3 additions & 2 deletions healthcheck/test_mwasrefarch_healthcheck_newvpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
from datetime import date
import json

def main(keypairname, password, ipAddress, location_arg, platform_arg):
def main(keypairname, password, location_arg, platform_arg):
# Reference architectures in production.
ref_arch_name = 'matlab-web-app-server-on-aws'
ipAddress = requests.get("https://api.ipify.org").text + "/32"
parameters = [{'ParameterKey': 'KeyPairName', 'ParameterValue': keypairname},
{'ParameterKey': 'AdminIPAddress', 'ParameterValue': ipAddress},
{'ParameterKey': 'Password', 'ParameterValue': password},
Expand Down Expand Up @@ -62,4 +63,4 @@ def main(keypairname, password, ipAddress, location_arg, platform_arg):
print("\n\n")

if __name__ == '__main__':
main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5])
main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])
5 changes: 3 additions & 2 deletions healthcheck/test_webappserver_refarch_existingvpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
from datetime import date
import sys

def main(keypairname, password, ipAddress, location_arg, platform_arg):
def main(keypairname, password, location_arg, platform_arg):
# Reference architectures in production.
# Deploy a stack for creating VPC with 2 subnets
existing_template_url = "https://matlab-web-app-server-templates.s3.amazonaws.com/r2022a_refarch/VPCStack.yml"
ipAddress = requests.get("https://api.ipify.org").text + "/32"
vpc_parameters = [{"ParameterKey": "AllowPublicIP",
"ParameterValue": "Yes"}]
existingstack = deploy.deploy_stack(existing_template_url, vpc_parameters, location_arg, "existingvpc")
Expand Down Expand Up @@ -88,4 +89,4 @@ def main(keypairname, password, ipAddress, location_arg, platform_arg):


if __name__ == '__main__':
main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5])
main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])