Skip to content

Add custom ECH deployment + smoke test#8337

Merged
michel-laterman merged 45 commits intoelastic:mainfrom
michel-laterman:integration-tests-custom-image
Jul 11, 2025
Merged

Add custom ECH deployment + smoke test#8337
michel-laterman merged 45 commits intoelastic:mainfrom
michel-laterman:integration-tests-custom-image

Conversation

@michel-laterman
Copy link
Contributor

@michel-laterman michel-laterman commented Jun 4, 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

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.
@michel-laterman michel-laterman added enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog backport-8.19 Automated backport to the 8.19 branch labels Jun 4, 2025
@michel-laterman
Copy link
Contributor Author

This PR copies the approach taken by #8035, but applies it to the normal integration test pipeline

@michel-laterman michel-laterman marked this pull request as ready for review June 5, 2025 20:10
@michel-laterman michel-laterman requested review from a team as code owners June 5, 2025 20:10
@elasticmachine
Copy link
Contributor

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

v1v
v1v previously approved these changes Jun 6, 2025
Copy link
Member

@v1v v1v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, at least the CI specifics. Thanks Michel.

It’s concerning how much duplicated configuration is needed here. We plan to revisit this in the future; however, for now, this is our reality.

swiatekm
swiatekm previously approved these changes Jun 6, 2025
Copy link
Contributor

@swiatekm swiatekm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good enough to me, though I think some of the env variable manipulation in cloud:load is unnecessary.

@michel-laterman michel-laterman enabled auto-merge (squash) June 6, 2025 15:35
@michel-laterman michel-laterman requested a review from v1v June 8, 2025 15:51
@mergify
Copy link
Contributor

mergify bot commented Jun 9, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b integration-tests-custom-image upstream/integration-tests-custom-image
git merge upstream/main
git push upstream integration-tests-custom-image

Copy link
Member

@v1v v1v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for cleaning up some of the cosmetic leftovers. I left a few comments

@elastic-sonarqube
Copy link

@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @michel-laterman

Copy link
Contributor

@pkoutsovasilis pkoutsovasilis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, @v1v please have another look at your comments, we need this PR as it increases the testing footprint of elastic-agent

Copy link
Member

@v1v v1v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides what we discussed in the thread, I approve the CI part

@v1v v1v self-requested a review July 10, 2025 20:50
@michel-laterman michel-laterman merged commit c1136e4 into elastic:main Jul 11, 2025
19 checks passed
mergify bot pushed a commit that referenced this pull request Jul 11, 2025
…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
michel-laterman added a commit that referenced this pull request Jul 17, 2025
* Use a custom image for the ECH deployment when running integration tests (#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

* Fix merge conflict

---------

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
Co-authored-by: michel-laterman <michel.laterman@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.19 Automated backport to the 8.19 branch 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.

7 participants