Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2026

What does this PR do?

Uses the google/go-containerregistry package to parse container tarballs in package tests, instead of parsing them manually. The tests now pass for images exported from the containerd image store.

Why is it important?

The current code only handles one container archive format. In particular, it doesn't handle exports from the containerd snapshotter, which docker enables by default for new installations as of v29.0. After the change, both formats are supported. We currently ship our tarballs using the older format, but eventually want to switch to the newer one. This change will also make package tests pass locally for new docker installs.

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

How to test this PR locally

Build a container image with the containerd image store enabled and run package tests via mage testPackages.

Related issues


This is an automatic backport of pull request #11724 done by [Mergify](https://mergify.com).

#11724)

* Use google/go-containerregistry to parse OCI images in packaging tests

* Use docker/go-units

Co-authored-by: Shaunak Kashyap <[email protected]>

* Add import

* Update beats submodule

* go mod tidy

---------

Co-authored-by: Shaunak Kashyap <[email protected]>
(cherry picked from commit 44814ff)

# Conflicts:
#	dev-tools/packaging/testing/package_test.go
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner January 29, 2026 20:04
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 29, 2026
@mergify mergify bot requested review from blakerouse and ycombinator and removed request for a team January 29, 2026 20:04
@mergify
Copy link
Contributor Author

mergify bot commented Jan 29, 2026

Cherry-pick of 44814ff has failed:

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

You are currently cherry-picking commit 44814ff4e.
  (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 <file>..." to mark resolution)
	both modified:   dev-tools/packaging/testing/package_test.go
	both modified:   go.mod
	both modified:   go.sum

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

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog chore Tasks that just need to be done, they are neither bug, nor enhancements labels Jan 29, 2026
@elasticmachine
Copy link
Contributor

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

@swiatekm swiatekm enabled auto-merge (squash) January 30, 2026 12:01
@swiatekm swiatekm merged commit bd43afa into 8.19 Jan 30, 2026
22 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.19/pr-11724 branch January 30, 2026 13:14
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @swiatekm

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

Labels

backport chore Tasks that just need to be done, they are neither bug, nor enhancements conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants