fix: run integ test on both architectures

Author: Fabiana Severin

.github/test-matrix.json

@@ -0,0 +1,14 @@
+{
+  "arch": [
+    {
+      "runner": "ubuntu-latest",
+      "label": "x64",
+      "sam_arch": "x86_64"
+    },
+    {
+      "runner": "ubuntu-24.04-arm",
+      "label": "arm64",
+      "sam_arch": "arm64"
+    }
+  ]
+}

.github/workflows/build-integration-test.yml

@@ -23,8 +23,26 @@ permissions:
   contents: read
 
 jobs:
-  build:
+  load-matrix:
     runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+
+      - name: Load test matrix
+        id: set
+        run: |
+          MATRIX=$(jq -c '.' .github/test-matrix.json)
+          echo "matrix=${MATRIX}" >> "$GITHUB_OUTPUT"
+
+  build:
+    needs: load-matrix
+    runs-on: ${{ matrix.arch.runner }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.load-matrix.outputs.matrix) }}
+    name: "build (${{ matrix.arch.label }})"
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 

.github/workflows/run-integration-test.yml

@@ -17,12 +17,30 @@ on:
       - 'lambda-integration-tests/**'
 
 jobs:
+  load-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+
+      - name: Load test matrix
+        id: set
+        run: |
+          MATRIX=$(jq -c '.' .github/test-matrix.json)
+          echo "matrix=${MATRIX}" >> "$GITHUB_OUTPUT"
+
   run-integration-tests:
-   # Only run on the main repo, not forks
+    needs: load-matrix
+    # Only run on the main repo, not forks
     if: ${{ github.repository_owner == 'aws' }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.arch.runner }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.load-matrix.outputs.matrix) }}
+    name: "integration-test (${{ matrix.arch.label }})"
     concurrency:
-      group: integration-test
+      group: integration-test-${{ matrix.arch.label }}
       cancel-in-progress: false
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
@@ -72,12 +90,12 @@ jobs:
           AWS_REGION: ${{ secrets.AWS_REGION }}
         run: |
           cd lambda-integration-tests
-          stackName="aws-lambda-java-log4j2-integ-test-$GITHUB_RUN_ID"
+          stackName="aws-lambda-java-log4j2-integ-test-${{ matrix.arch.label }}-$GITHUB_RUN_ID"
           echo "STACK_NAME=$stackName" >> "$GITHUB_OUTPUT"
           echo "Stack name = $stackName"
           sam deploy \
             --stack-name "${stackName}" \
-            --parameter-overrides "ParameterKey=LambdaRole,ParameterValue=${{ secrets.AWS_LAMBDA_ROLE }}" \
+            --parameter-overrides "ParameterKey=LambdaRole,ParameterValue=${{ secrets.AWS_LAMBDA_ROLE }} ParameterKey=Architecture,ParameterValue=${{ matrix.arch.sam_arch }}" \
             --no-confirm-changeset \
             --no-progressbar \
             --resolve-s3 \

lambda-integration-tests/template.yaml

@@ -5,6 +5,12 @@ Description: aws-lambda-java-log4j2 integration tests
 Parameters:
   LambdaRole:
     Type: String
+  Architecture:
+    Type: String
+    Default: x86_64
+    AllowedValues:
+      - x86_64
+      - arm64
 
 Globals:
   Function:
@@ -20,6 +26,8 @@ Resources:
       CodeUri: log4j2-test-function/
       Handler: integ.Log4j2TestHandler::handleRequest
       Runtime: java21
+      Architectures:
+        - !Ref Architecture
       Role: !Ref LambdaRole
       Environment:
         Variables: