Skip to content

[8.19] (backport #8337) Add custom ECH deployment + smoke test#8968

Merged
michel-laterman merged 4 commits into8.19from
mergify/bp/8.19/pr-8337
Jul 17, 2025
Merged

[8.19] (backport #8337) Add custom ECH deployment + smoke test#8968
michel-laterman merged 4 commits into8.19from
mergify/bp/8.19/pr-8337

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 11, 2025

What does this PR do?

Use the image produced in the packaging step as the integrations server image for an ECH deployment and run a basic smoke test against that deployment. This allows for the changes made in a PR to be tested as a part of the cloud image in addition to the current test coverage.

Why is it important?

Removes the 1 day delay from producing a SNAPSHOT image to testing the image.

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

N/A


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

…sts (#8337)

Use the image produced in the packaging step as the integrations server
image on ECH when a cloud deployment is provisioned for integrations
tests. This allows for the changes made in a PR to be tested on the
cloud deployment in addition to the current client-focused tests.

(cherry picked from commit c1136e4)

# Conflicts:
#	magefile.go
@mergify mergify bot added the backport label Jul 11, 2025
@mergify mergify bot requested a review from a team as a code owner July 11, 2025 14:10
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 11, 2025
@mergify mergify bot requested review from a team as code owners July 11, 2025 14:10
@mergify mergify bot removed the request for review from a team July 11, 2025 14:10
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Jul 11, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jul 11, 2025

Cherry-pick of c1136e4 has failed:

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

You are currently cherry-picking commit c1136e4ab.
  (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:
	modified:   .buildkite/bk.integration-fips.pipeline.yml
	modified:   .buildkite/bk.integration.pipeline.yml
	modified:   .buildkite/integration.pipeline.yml
	modified:   .buildkite/scripts/steps/integration_tests_tf.sh
	new file:   testing/integration/ess/ech_test.go
	modified:   testing/integration/groups.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   magefile.go

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 enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Jul 11, 2025
@elasticmachine
Copy link
Contributor

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

@mergify
Copy link
Contributor Author

mergify bot commented Jul 14, 2025

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

@pkoutsovasilis
Copy link
Contributor

@michel-laterman could you please handle the conflicts of this backport? 🙂

@elasticmachine
Copy link
Contributor

⏳ Build in-progress, with failures

Failed CI Steps

History

cc @michel-laterman

@michel-laterman michel-laterman merged commit e0d8c6c into 8.19 Jul 17, 2025
17 checks passed
@michel-laterman michel-laterman deleted the mergify/bp/8.19/pr-8337 branch July 17, 2025 21:07
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 enhancement New feature or 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.

3 participants