Merge pull request #700 from hjgraca/hjgraca-e2e-aot

chore: Fix arm e2e aot

Author: hjgraca

.github/workflows/e2e-tests.yml

@@ -51,7 +51,15 @@ jobs:
           cdk deploy --require-approval never
 
   deploy-aot-stack:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-24.04-arm, ubuntu-latest]
+        include:
+          - os: ubuntu-24.04-arm
+            arch: arm64
+          - os: ubuntu-latest
+            arch: x86_64
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -73,10 +81,10 @@ jobs:
       - name: Install AWS Lambda .NET CLI Tools
         run: dotnet tool install -g Amazon.Lambda.Tools
 
-      - name: Deploy AOT Stack x86_64
+      - name: Deploy AOT Stack
         run: |
           cd libraries/tests/e2e/infra-aot
-          cdk deploy -c architecture=x86_64 --require-approval never
+          cdk deploy -c architecture=${{ matrix.arch }} --require-approval never
 
   run-tests:
     runs-on: ubuntu-latest
@@ -132,8 +140,38 @@ jobs:
         run: |
           cd libraries/tests/e2e/infra
           cdk destroy --force
-          
-      - name: Destroy AOT Core Stack
+
+  destroy-aot-stack:
+    strategy:
+      matrix:
+        os: [ubuntu-24.04-arm, ubuntu-latest]
+        include:
+          - os: ubuntu-24.04-arm
+            arch: arm64
+          - os: ubuntu-latest
+            arch: x86_64
+    runs-on: ${{ matrix.os }}
+    needs: run-tests
+    if: always()
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502
+        with:
+          role-to-assume: ${{ secrets.E2E_DEPLOY_ROLE }}
+          aws-region: us-east-1
+          mask-aws-account-id: true
+
+      - name: Install CDK
+        run: npm install -g aws-cdk
+        
+      - name: Install AWS Lambda .NET CLI Tools
+        run: dotnet tool install -g Amazon.Lambda.Tools
+
+      - name: Destroy arm64 AOT Core Stack
         run: |
           cd libraries/tests/e2e/infra-aot
-          cdk destroy -c architecture=x86_64 --force
+          cdk destroy -c architecture=${{ matrix.arch }} --force
+      

libraries/tests/e2e/infra-aot/Program.cs

@@ -19,11 +19,17 @@ public static void Main(string[] args)
                 throw new System.ArgumentException("architecture context must be either arm64 or x86_64");
             }
 
-            _ = new CoreAotStack(app, "CoreAotStack", new AotStackProps
+            var id = "CoreAotStack";
+            if(architecture == "arm64")
+            {
+                id = $"CoreAotStack-{architecture}";
+            }
+
+            _ = new CoreAotStack(app, id, new AotStackProps
             {
                 Architecture = architecture
             });
             app.Synth();
         }
     }
-}
+}