Merge branch 'inject-build-pgo-profile' into update-pgo-1726276668

elastic · Sep 14, 2024 · 03fe92a · 03fe92a
2 parents 790a6a1 + 9cd645f
commit 03fe92a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -192,19 +192,19 @@ jobs:
       # via a PR to update default.pgo.
 
       - name: Copy CPU profile
-        if: ${{ inputs.runStandalone }}
+        if: ${{ inputs.runStandalone && github.ref == 'refs/heads/main' }}
         run: make cp-cpuprof
 
       - name: Upload CPU profile
-        if: ${{ inputs.runStandalone }}
+        if: ${{ inputs.runStandalone && github.ref == 'refs/heads/main' }}
         uses: actions/upload-artifact@v4
         with:
           name: cpu-profile
           path: ${{ env.WORKING_DIRECTORY }}/${{ env.BENCHMARK_CPU_OUT }}
           if-no-files-found: error
 
       - name: Open PGO PR
-        if: ${{ inputs.runStandalone }}
+        if: ${{ inputs.runStandalone && github.ref == 'refs/heads/main' }}
         run: |
           cd "${{ github.workspace }}"
           mv "$PROFILE_PATH" x-pack/apm-server/default.pgo

diff --git a/testing/benchmark/Makefile b/testing/benchmark/Makefile
@@ -9,8 +9,6 @@ MOXY_GOARCH ?= amd64
 APM_SERVER_GOOS ?= linux
 APM_SERVER_GOARCH ?= amd64
 
-RUN_STANDALONE ?= false
-
 TFVARS_SOURCE ?= terraform.tfvars.example
 
 BENCHMARK_WARMUP_TIME ?= 5m
@@ -33,6 +31,7 @@ SSH_OPTS ?= -o LogLevel=ERROR -o StrictHostKeyChecking=no -o ServerAliveInterval
 SSH_KEY ?= ~/.ssh/id_rsa_terraform
 WORKER_IP = $(shell terraform output -raw public_ip)
 APM_SERVER_IP = $(shell terraform output -raw apm_server_ip)
+RUN_STANDALONE = $(shell echo var.run_standalone | terraform console | tr -d '"')
 
 SHELL = /bin/bash
 .SHELLFLAGS = -o pipefail -c