Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2025

Following up to #7804, this PR cleans up unused fields and adds a test case to the TestGetArtifactName unit test introduced in that PR.


This is an automatic backport of pull request #8559 done by Mergify.

(cherry picked from commit 0260c45)

# Conflicts:
#	internal/pkg/agent/application/upgrade/artifact/artifact_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 17, 2025
@mergify mergify bot requested a review from a team as a code owner June 17, 2025 16:54
@mergify mergify bot requested review from blakerouse and ycombinator and removed request for a team June 17, 2025 16:54
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Jun 17, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 17, 2025

Cherry-pick of 0260c45 has failed:

On branch mergify/bp/8.19/pr-8559
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 0260c4549.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   internal/pkg/agent/application/upgrade/artifact/artifact_test.go

no changes added to commit (use "git add" and/or "git commit -a")

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

@elasticmachine
Copy link
Collaborator

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

@ycombinator ycombinator enabled auto-merge (squash) June 17, 2025 16:59
@elastic-sonarqube
Copy link

@ycombinator ycombinator merged commit ce2708b into 8.19 Jun 17, 2025
24 checks passed
@ycombinator ycombinator deleted the mergify/bp/8.19/pr-8559 branch June 17, 2025 18:35
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

cc @ycombinator

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants