Repository navigation
[backport-aws-7.1] Sync CI configuration with main branch - #21150
Conversation
|
/test |
🚀 Benchmarks reportPackage
|
| Data stream | Previous EPS | New EPS | Diff (%) | Result |
|---|---|---|---|---|
firewall_logs |
4464.29 | 3424.66 | -1039.63 (-23.29%) | 💔 |
apigateway_logs |
28571.43 | 17241.38 | -11330.05 (-39.66%) | 💔 |
To see the full report comment with /test benchmark fullreport
💚 Build Succeeded
History
cc @mrodm |
There was a problem hiding this comment.
🟡 Changes recommended
.buildkite/scripts/backport_branch.sh uses \s in grep -E/sed patterns, which won’t match the indented YAML keys and can prevent preserving/restoring the version pins.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
This PR backports CI and automation updates from main onto the backport-aws-7.1 branch so that branch-scoped Buildkite and GitHub Actions workflows continue to run correctly on active backport branches.
Changes:
- Sync Buildkite pipelines/scripts and GitHub Actions workflows with
main(including updated permission checks and path watches). - Update the backport CLI module dependencies and adjust backport-tool tests/docs references to the new
cmd/backport/**layout. - Improve package detection in Buildkite scripts by cross-referencing
mage listPackagesoutput (handles nested package roots).
File summaries
| File | Description |
|---|---|
dev/citools/logsdb_test.go |
Fix test-case string typo and remove trailing blank lines. |
dev/citools/kibana_test.go |
Fix test-case string typo. |
cmd/backport/go.mod |
Bump go-gh / safeexec versions. |
cmd/backport/go.sum |
Update sums for bumped and newly pulled transitive dependencies. |
cmd/backport/backports/packages/detect_test.go |
Update test references from dev/backports/** to cmd/backport/**. |
cmd/backport/backports/owners/check.go |
Update comment reference to new package-index location. |
cmd/backport/backports/apply/apply.go |
Update comment reference for branch-name regex source. |
cmd/backport/backports/apply/apply_test.go |
Update comment reference for owners logic location. |
.github/workflows/sync-backport-changelog.yml |
Allow maintain permission in actor permission gate and update message. |
.github/workflows/auto-backport.yml |
Allow maintain permission in actor permission gate and update message. |
.buildkite/scripts/trigger_integrations_in_parallel.sh |
Use mage listPackages output to correctly detect nested package roots impacted by diffs. |
.buildkite/scripts/test_integrations_with_serverless.sh |
Same nested-package detection improvement for serverless test pipeline. |
.buildkite/scripts/backport_branch.sh |
Preserve/restore K8S/KIND pins from pipeline.serverless.yml as well as pipeline.yml. |
.buildkite/pipeline.serverless.yml |
Add ELASTIC_PACKAGE_SERVERLESS_KIBANA_SKIP_UPLOAD_PACKAGE_VALIDATION env var. |
.buildkite/pipeline.backport-dispatch.yml |
Update watched path from dev/backports/** to cmd/backport/**. |
Review details
Suppressed comments (2)
.buildkite/scripts/backport_branch.sh:168
grep -Edoesn’t treat\sas whitespace, so these lookups won’t match the indentedK8S_VERSION:/KIND_VERSION:lines in.buildkite/pipeline.serverless.yml, and the values won’t be preserved.
if [ -f "${pipeline_serverless_yml}" ]; then
serverless_k8s_version_line=$(grep -E '^\s*K8S_VERSION:' "${pipeline_serverless_yml}" || true)
serverless_kind_version_line=$(grep -E '^\s*KIND_VERSION:' "${pipeline_serverless_yml}" || true)
echo "Preserving from backport branch (pipeline.serverless.yml): ${serverless_k8s_version_line}, ${serverless_kind_version_line}"
fi
.buildkite/scripts/backport_branch.sh:184
- The
sedsearch regex uses\s, which isn’t a portable whitespace matcher and won’t match the indentedK8S_VERSION:/KIND_VERSION:lines in the current pipeline YAMLs. That can prevent restoring the version pins after syncing the.buildkitedirectory.
echo "--- Restoring KIND_VERSION in ${pipeline_yml}..."
sed -i "s|^\s*KIND_VERSION:.*|${kind_version_line}|" "${pipeline_yml}"
fi
if [ -n "${serverless_k8s_version_line}" ]; then
echo "--- Restoring K8S_VERSION in ${pipeline_serverless_yml}..."
- Files reviewed: 14/15 changed files
- Comments generated: 1
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| if [ -f "${pipeline_yml}" ]; then | ||
| k8s_version_line=$(grep -E '^\s*K8S_VERSION:' "${pipeline_yml}" || true) | ||
| kind_version_line=$(grep -E '^\s*KIND_VERSION:' "${pipeline_yml}" || true) | ||
| echo "Preserving from backport branch: ${k8s_version_line}, ${kind_version_line}" | ||
| echo "Preserving from backport branch (pipeline.yml): ${k8s_version_line}, ${kind_version_line}" | ||
| fi |
|
Tick the box to add this pull request to the merge queue (same as
|
|
Changelog sync skipped — all changelog versions are already present on |
TL;DR
Syncs
.buildkiteCI configuration and GitHub Actions workflows frommainto thebackport-aws-7.1backport branch, ensuring automated workflows and toolingimprovements are consistent across all supported branches.
Proposed commit message
Author's Checklist
main.KIND_VERSIONandK8S_VERSIONremain atv0.32.0/v1.36.1(same asmain— no version-specific pins needed for this branch).pipeline.backport-dispatch.ymlnow watchescmd/backport/**(renamed fromdev/backports/**).maintainpermission level accepted in GitHub Actions workflows alongsidewrite/admin.How to test this PR locally
Verify that the CI pipeline files reflect the synced configuration:
Related issues
🤖 Generated with Claude Code