Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 9, 2025

What does this PR do?

Add a new buildkite pipeline to build a custom agent image and use it in an ECH deployment for testing.

Why is it important?

FIPS integration tests will require a custom agent running in the CFT region.

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 #8035 done by Mergify.

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 9, 2025
@mergify mergify bot requested review from a team as code owners June 9, 2025 19:44
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 9, 2025
@mergify mergify bot removed the request for review from a team June 9, 2025 19:44
@mergify mergify bot requested a review from blakerouse June 9, 2025 19:44
@mergify mergify bot added the backport label Jun 9, 2025
@mergify mergify bot requested a review from kaanyalti June 9, 2025 19:44
@mergify
Copy link
Contributor Author

mergify bot commented Jun 9, 2025

Cherry-pick of 5908ed2 has failed:

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

You are currently cherry-picking commit 5908ed22e.
  (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:
	new file:   .buildkite/bk.integration-fips.pipeline.yml
	modified:   .buildkite/hooks/pre-command
	modified:   .buildkite/integration.pipeline.yml
	modified:   .buildkite/scripts/buildkite-integration-tests.sh
	modified:   .ci/updatecli/updatecli-bump-vm-images.yml
	modified:   .tool-versions
	modified:   magefile.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   testing/integration/fleetserver_fips_test.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 Jun 9, 2025
@elasticmachine
Copy link
Collaborator

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

@mergify
Copy link
Contributor Author

mergify bot commented Jun 10, 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 mergify/bp/8.19/pr-8035 upstream/mergify/bp/8.19/pr-8035
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-8035

Add a new buildkite pipeline to build a custom agent image and use it in an ECH deployment for testing.
Run FIPS integration tests on VMs with a FIPS provider.

(cherry picked from commit 5908ed2)
@michel-laterman michel-laterman force-pushed the mergify/bp/8.19/pr-8035 branch from 7738141 to 6a9616f Compare June 10, 2025 16:22
@michel-laterman
Copy link
Contributor

I've cherry-picked the backport from #8436 as well

@mergify
Copy link
Contributor Author

mergify bot commented Jun 10, 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 mergify/bp/8.19/pr-8035 upstream/mergify/bp/8.19/pr-8035
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-8035

@elastic-sonarqube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

cc @michel-laterman

@michel-laterman michel-laterman merged commit 53e0f73 into 8.19 Jun 10, 2025
11 checks passed
@michel-laterman michel-laterman deleted the mergify/bp/8.19/pr-8035 branch June 10, 2025 20:01
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.

4 participants