Skip to content

Commit

Permalink
Merge branch 'inject-build-pgo-profile' into inject-build-pgo-profile…
Browse files Browse the repository at this point in the history
…-test
  • Loading branch information
1pkg committed Oct 1, 2024
2 parents 8ad8895 + e60e927 commit 2d87ef9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
1 change: 0 additions & 1 deletion .github/workflows/benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ jobs:
permissions:
contents: write
id-token: write
pull-requests: write
env:
SSH_KEY: ./id_rsa_terraform
TF_VAR_private_key: ./id_rsa_terraform
Expand Down
22 changes: 11 additions & 11 deletions testing/benchmark/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -182,17 +182,17 @@ cleanup-elasticsearch:
PGO_BRANCH = update-pgo-$(shell date +%s)
.PHONY: push-pgo-pr
push-pgo-pr:
@cd $(WORKSPACE_PATH)
@git config user.email "[email protected]"
@git config user.name "APM Server"
@git fetch origin main
@git checkout main
@git checkout -b $(PGO_BRANCH)
@mv $(PROFILE_PATH) x-pack/apm-server/default.pgo
@git add x-pack/apm-server/default.pgo
@git commit -m "PGO: Update default.pgo from benchmarks $(WORKFLOW)."
@git push -u origin $(PGO_BRANCH)
@gh pr create -B main -H $(PGO_BRANCH) -t "PGO: Update default.pgo" -b "Update default.pgo CPU profile from the benchmarks [workflow]($(WORKFLOW))." -R elastic/apm-server
@cd $(WORKSPACE_PATH); \
git config user.email "[email protected]"; \
git config user.name "APM Server"; \
git fetch origin main; \
git checkout main; \
git checkout -b $(PGO_BRANCH); \
mv $(PROFILE_PATH) x-pack/apm-server/default.pgo; \
git add x-pack/apm-server/default.pgo; \
git commit -m "PGO: Update default.pgo from benchmarks $(WORKFLOW)."; \
git push -u origin $(PGO_BRANCH); \
gh pr create -B main -H $(PGO_BRANCH) -t "PGO: Update default.pgo" -b "Update default.pgo CPU profile from the benchmarks [workflow]($(WORKFLOW))." -R elastic/apm-server

##############################################################################
# Target for creating a .tfvars file, defining the custom Docker images to
Expand Down

0 comments on commit 2d87ef9

Please sign in to comment.