Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 30, 2025

What does this PR do?

This PR renames deployment_csp_configuration.yaml back to create_deployment_csp_configuration.yaml (introduced by this PR) as this file is currently used by the github action, which runs from main, and bump the ESS version for our CI integration tests. Thus the name of this file needs to stay same across all release branches that the former PR doesn't have to be in.

Why is it important?

Because we need to have working github actions

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

None, this change is solely regarding the CI

How to test this PR locally

This change affects only the CI so no local testing is possible, open a draft PR against main 🙂

Related issues

…_configuration.yaml (#8746) (cherry picked from commit 2252fdd) # Conflicts: #	.ci/updatecli/updatecli-bump-stack-version.yml #	.mergify.yml #	test_infra/ess/readme.md
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 30, 2025
@mergify mergify bot requested review from a team as code owners June 30, 2025 18:18
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Jun 30, 2025
@mergify mergify bot requested review from kaanyalti and ycombinator and removed request for a team June 30, 2025 18:18
@mergify
Copy link
Contributor Author

mergify bot commented Jun 30, 2025

Cherry-pick of 2252fdd has failed:

On branch mergify/bp/8.19/pr-8746 Your branch is up to date with 'origin/8.19'. You are currently cherry-picking commit 2252fdd7c. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed:	renamed: pkg/testing/ess/deployment_csp_configuration.yaml -> pkg/testing/ess/create_deployment_csp_configuration.yaml	modified: pkg/testing/ess/deployment.go	modified: test_infra/ess/deployment.tf Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution)	deleted by us: .ci/updatecli/updatecli-bump-stack-version.yml	both modified: .mergify.yml	deleted by us: test_infra/ess/readme.md 

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Jun 30, 2025
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@elasticmachine
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

cc @pkoutsovasilis

@pkoutsovasilis pkoutsovasilis merged commit 88f0858 into 8.19 Jun 30, 2025
19 checks passed
@pkoutsovasilis pkoutsovasilis deleted the mergify/bp/8.19/pr-8746 branch June 30, 2025 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

3 participants