Skip to content

Commit 5163579

Browse files
Added code to fetch IP
* Added aws credentials via oidc * Changed role name * Changed to ireland arn in existingvpc-ubuntu-tue * Added logger and removed push for few workflows * Changed keypairname for ireland * Updated ssl certificate arn * Changed role duration to 2hrs * Added aws credentials via oids for all workflows * Added aws credentials via oidc for all workflows * Changed role duration to 2 hrs for all workflows * Updated python version to 3.13 * Added run for newvpc-win-wed workflow * Changed to ireland arn in existingvpc-ubuntu-tue * Added logger and removed push for few workflows * Updated python version to 3.13 * Added run for newvpc-win-wed workflow * Added code to fetch IP
1 parent 38190e5 commit 5163579

6 files changed

+10
-9
lines changed

.github/workflows/healthcheck-app-existingVpc-Ubuntu-Tue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ jobs:
4040
- name: MPS Ref Arch AWS existing VPC Health Check Test eu-west on Ubuntu
4141
run: |
4242
cd healthcheck
43-
python test_healthcheck_existing_vpc.py ${{ secrets.OIDCKeyPairNameIreland }} ${{ secrets.lmpassword }} ${{ secrets.ipaddress }} ${{ secrets.OIDCSSLCertificateARNIreland }} "eu-west-1" "Ubuntu"
43+
python test_healthcheck_existing_vpc.py ${{ secrets.OIDCKeyPairNameIreland }} ${{ secrets.lmpassword }} ${{ secrets.OIDCSSLCertificateARNIreland }} "eu-west-1" "Ubuntu"
4444

.github/workflows/healthcheck-app-existingVpc-Win-Thurs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ jobs:
4040
- name: MPS Ref Arch AWS existing VPC Health Check Test us-east on Windows
4141
run: |
4242
cd healthcheck
43-
python test_healthcheck_existing_vpc.py ${{ secrets.OIDCKeyPairNameVirginia }} ${{ secrets.lmpassword }} ${{ secrets.ipaddress }} ${{ secrets.OIDCSSLCertificateARNVirginia }} "us-east-1" "Windows"
43+
python test_healthcheck_existing_vpc.py ${{ secrets.OIDCKeyPairNameVirginia }} ${{ secrets.lmpassword }} ${{ secrets.OIDCSSLCertificateARNVirginia }} "us-east-1" "Windows"
4444

.github/workflows/healthcheck-app-newVpc-Ubuntu-Mon.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ jobs:
4141
- name: MPS Ref Arch AWS new VPC Health Check Test us-west on Ubuntu
4242
run: |
4343
cd healthcheck
44-
python test_healthcheck_new_vnet.py ${{ secrets.OIDCKeyPairNameOregon }} ${{ secrets.lmpassword }} ${{ secrets.ipaddress }} ${{ secrets.OIDCSSLCertificateARNOregon }} "us-west-2" "Ubuntu"
44+
python test_healthcheck_new_vnet.py ${{ secrets.OIDCKeyPairNameOregon }} ${{ secrets.lmpassword }} ${{ secrets.OIDCSSLCertificateARNOregon }} "us-west-2" "Ubuntu"
4545

.github/workflows/healthcheck-app-newVpc-Win-Wed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ jobs:
4040
- name: MPS Ref Arch AWS new VPC Health Check Test ap-northeast on Windows
4141
run: |
4242
cd healthcheck
43-
python test_healthcheck_new_vnet.py ${{ secrets.OIDCKeyPairNameTokyo }} ${{ secrets.lmpassword }} ${{ secrets.ipaddress }} ${{ secrets.OIDCSSLCertificateARNTokyo }} "ap-northeast-1" "Windows"
43+
python test_healthcheck_new_vnet.py ${{ secrets.OIDCKeyPairNameTokyo }} ${{ secrets.lmpassword }} ${{ secrets.OIDCSSLCertificateARNTokyo }} "ap-northeast-1" "Windows"
4444

healthcheck/test_healthcheck_existing_vpc.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
from datetime import date
1212
import time
1313

14-
def main(keypairname, password, ipAddress, SSLCertificateARN, region, platform):
14+
def main(keypairname, password, SSLCertificateARN, region, platform):
1515

1616
# Reference architectures in production.
1717
ref_arch_name = 'matlab-production-server-on-aws'
18-
18+
ipAddress = requests.get("https://api.ipify.org").text + "/32"
1919
vpc_parameters = [{"ParameterKey": "AllowPublicIP",
2020
"ParameterValue": "Yes"}]
2121

@@ -95,4 +95,4 @@ def main(keypairname, password, ipAddress, SSLCertificateARN, region, platform):
9595
print("Date time after deletion of stacks:-", ct)
9696

9797
if __name__ == "__main__":
98-
main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6])
98+
main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5])

healthcheck/test_healthcheck_new_vnet.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
import random
1111
from datetime import date
1212

13-
def main(keypairname, password, ipAddress, SSLCertificateARN, region, platform):
13+
def main(keypairname, password, SSLCertificateARN, region, platform):
1414
# Reference architectures in production.
1515
ref_arch_name = 'matlab-production-server-on-aws'
16+
ipAddress = requests.get("https://api.ipify.org").text + "/32"
1617
parameters = [{'ParameterKey': 'KeyPairName', 'ParameterValue': keypairname},
1718
{'ParameterKey': 'SSLCertificateARN', 'ParameterValue': SSLCertificateARN},
1819
{'ParameterKey': 'ClientIPAddress', 'ParameterValue': ipAddress},
@@ -66,4 +67,4 @@ def main(keypairname, password, ipAddress, SSLCertificateARN, region, platform):
6667
print("Date time after deployment and deletion of stack:-", ct)
6768

6869
if __name__ == '__main__':
69-
main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6])
70+
main(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5])

0 commit comments

Comments
 (0)