Merge pull request #1091 from newrelic/dev

Release 11.10

Author: lavarou

.github/workflows/make-agent.yml

@@ -40,12 +40,6 @@ jobs:
           path: php-agent
           repository: ${{ inputs.origin }}/newrelic-php-agent
           ref: ${{ inputs.ref }}
-      - name: Enable arm64 emulation
-        if: ${{ inputs.arch == 'arm64' }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:${{vars.BINFMT_IMAGE_VERSION}}
-          platforms: arm64
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:

.github/workflows/make-integration-tests.yml

@@ -24,6 +24,10 @@ on:
         description: 'runner type'
         required: true
         type: string
+      use-valgrind:
+        required: true
+        default: false
+        type: boolean
 
 jobs:
   test-agent:
@@ -56,12 +60,6 @@ jobs:
         run: |
           chmod 755 php-agent/bin/integration_runner
           chmod 755 php-agent/agent/modules/newrelic.so
-      - name: Enable arm64 emulation
-        if: ${{ inputs.arch == 'arm64' }}
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:${{vars.BINFMT_IMAGE_VERSION}}
-          platforms: arm64
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -83,7 +81,7 @@ jobs:
         run: |
           docker exec \
           -e PHPS=${{matrix.php}} \
-          -e INTEGRATION_ARGS="-license ${{secrets.NR_TEST_LICENSE}} -collector ${{secrets.NR_COLLECTOR_HOST}} -agent agent/modules/newrelic.so" \
+          -e INTEGRATION_ARGS="-license ${{secrets.NR_TEST_LICENSE}} -collector ${{secrets.NR_COLLECTOR_HOST}} -agent agent/modules/newrelic.so ${{ inputs.use-valgrind && '-valgrind /usr/bin/valgrind' }}" \
           -e APP_supportability=${{secrets.APP_SUPPORTABILITY}} \
           -e ACCOUNT_supportability=${{secrets.ACCOUNT_SUPPORTABILITY}} \
           -e ACCOUNT_supportability_trusted=${{secrets.ACCOUNT_SUPPORTABILITY_TRUSTED}} \

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

@@ -21,15 +21,16 @@ on:
       runner-type:
         description: 'Type of a runner to use for integration tests on arm64'
         required: true
-        default: 'ubuntu-20.04-4core' 
+        default: 'ubuntu-24.04-arm'
         type: choice
         options: 
-        - ubuntu-20.04-4core
-        - ubuntu-20.04-8core
-        - ubuntu-20.04-16core
-        - ubuntu-22.04-4core
-        - ubuntu-latest
-
+        - ubuntu-22.04-arm
+        - ubuntu-24.04-arm
+      use-valgrind:
+        description: 'Use valgrind?'
+        required: true
+        default: false
+        type: boolean
 jobs:
   build-test-runner-amd64:
     uses: ./.github/workflows/make-for-platform-on-arch.yml
@@ -55,7 +56,7 @@ jobs:
       artifact-name: integration_runner
       artifact-pattern: bin/integration_runner
       arch: arm64
-      runs-on: ubuntu-latest
+      runs-on: ${{inputs.runner-type}}
     secrets: inherit
 
   build-agent-amd64:
@@ -72,7 +73,7 @@ jobs:
       origin: ${{ inputs.origin }}
       ref: ${{ inputs.ref }}
       arch: arm64
-      runs-on: ubuntu-latest
+      runs-on: ${{inputs.runner-type}}
     secrets: inherit
 
   test-amd64:
@@ -81,6 +82,7 @@ jobs:
     with:
       origin: ${{ inputs.origin }}
       ref: ${{ inputs.ref }}
+      use-valgrind: ${{ inputs.use-valgrind }}
       arch: amd64
       runs-on: ubuntu-latest
       continue-on-error: false
@@ -91,6 +93,7 @@ jobs:
     with:
       origin: ${{ inputs.origin }}
       ref: ${{ inputs.ref }}
+      use-valgrind: ${{ inputs.use-valgrind }}
       arch: arm64
       runs-on: ${{inputs.runner-type}}
       continue-on-error: true