added rest of the tests

aws · Dec 5, 2024 · f4f8f42 · f4f8f42
1 parent 8366d70
commit f4f8f42
Show file tree

Hide file tree

Showing 6 changed files with 1,220 additions and 1,146 deletions.
diff --git a/.github/workflows/deploy-canary.yml b/.github/workflows/deploy-canary.yml
@@ -33,7 +33,12 @@ jobs:
         with:
           repository: ${{env.CWA_GITHUB_TEST_REPO_NAME}}
           ref: ${{env.CWA_GITHUB_TEST_REPO_BRANCH}}
-
+      - name: Add Runner to Security Group
+        uses: twosense/add-ip-to-ec2-security-group@v1.2
+        with:
+            security-group-id: ${{ secrets.AWS_TERRAFORM_SECURITY_GROUP_ID}}
+            port: ${{ runner.os == 'Windows' && vars.WIN_CONNECTION_PORT || vars.LINUX_CONNECTION_PORT }}
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:

diff --git a/.github/workflows/ec2-integration-test.yml b/.github/workflows/ec2-integration-test.yml
@@ -40,9 +40,6 @@ on:
         type: string
       s3_integration_bucket:
         type: string
-      connection_port:
-        type: string
-        required: true
 
 jobs:
   EC2IntegrationTest:
@@ -71,9 +68,9 @@ jobs:
       - name: Add Runner to Security Group
         uses: twosense/add-ip-to-ec2-security-group@v1.2
         with:
-            security-group-id: ${{ secrets.AWS_TERRAFORM_SECURITY_GROUP_ID}}
-            port: ${{ inputs.connection_port }}
-
+          security-group-id: ${{ secrets.AWS_TERRAFORM_SECURITY_GROUP_ID}}
+          port: ${{ runner.os == 'Windows' && vars.WIN_CONNECTION_PORT || vars.LINUX_CONNECTION_PORT }}
+    
 
       - name: Cache if success
         id: cache_if_success