Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 25, 2025

What does this PR do?

Add tests to check synthetics dependencies for complete variant docker packages. These will prevent the possibility of an unrelated change removing the required dependencies.

Why is it important?

We have seen instances where unrelated changes to the docker template have caused the generated -complete variants to be missing synthetics dependencies.

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

  1. Edit elastic-agent docker template sections where synthetics-deps are installed.
  2. Build agent locally.
  3. Wait for testing step to fail.
  4. Restore elastic-agent template.
  5. Build and wait for completion.

Related issues

…8605)

* Add docker integration test for synthetics deps

(cherry picked from commit f8c1f2e)

# Conflicts:
#	dev-tools/packaging/testing/package_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 25, 2025
@mergify mergify bot requested a review from a team as a code owner June 25, 2025 18:31
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 25, 2025
@mergify mergify bot requested review from swiatekm and removed request for a team June 25, 2025 18:31
@mergify mergify bot added the backport label Jun 25, 2025
@mergify mergify bot requested a review from pchila June 25, 2025 18:31
@mergify
Copy link
Contributor Author

mergify bot commented Jun 25, 2025

Cherry-pick of f8c1f2e has failed:

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

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

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 Team:obs-ds-hosted-services Label for the Observability Hosted Services team labels Jun 25, 2025
@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services)

@pchila
Copy link
Member

pchila commented Jun 26, 2025

@emilioalvap as author of the original PR #8605, could you please fix the backports ?

Thank you

@emilioalvap emilioalvap enabled auto-merge (squash) June 27, 2025 22:13
@elastic-sonarqube
Copy link

@elasticmachine
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @emilioalvap

@mergify
Copy link
Contributor Author

mergify bot commented Jun 30, 2025

This pull request has not been merged yet. Could you please review and merge it @emilioalvap? 🙏

@emilioalvap
Copy link
Contributor

@pchila Thanks for the reminder. This should be fixed now, please review.

@emilioalvap emilioalvap merged commit eb4fca2 into 8.19 Jul 1, 2025
19 checks passed
@emilioalvap emilioalvap deleted the mergify/bp/8.19/pr-8605 branch July 1, 2025 12:08
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 Team:obs-ds-hosted-services Label for the Observability Hosted Services team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants