Skip to content

[8.18] backport #4912 #4985 #5000 #5075#5397

Merged
michel-laterman merged 17 commits intoelastic:8.18from
michel-laterman:backport/mage-8.18
Sep 24, 2025
Merged

[8.18] backport #4912 #4985 #5000 #5075#5397
michel-laterman merged 17 commits intoelastic:8.18from
michel-laterman:backport/mage-8.18

Conversation

@michel-laterman
Copy link
Copy Markdown
Contributor

Backport PRs #4912 #4985 #5000 #5075 to 8.18 so that mage is used instead of Make.
Do additional cleanup so FIPS references have been removed.

Reimplement Makefile targets in mage.
Change buildkite pipeline to use mage.
Change Dockerfile* to use mage.

(cherry picked from commit db5f46b)

# Conflicts:
#	.buildkite/pipeline.yml
#	.buildkite/scripts/common.sh
#	.buildkite/scripts/local_build.sh
#	.buildkite/scripts/test-release.sh
#	Dockerfile.build
#	Dockerfile.fips
#	Makefile
#	NOTICE.txt
#	README.md
#	dev-tools/cloud/Makefile
#	dev-tools/cloud/terraform/main.tf
#	dev-tools/e2e/Dockerfile
#	dev-tools/e2e/build.sh
#	dev-tools/e2e/validatecerts.go
#	dev-tools/go.mod
#	dev-tools/go.sum
#	docs/developers-guide.md
#	docs/docker-images.md
#	docs/fips.md
#	testing/e2e/fips_test.go
* Ensure directory is made within zip artifacts

* Make test:release extraction stricter
…#5000)

Fail the pipeline if cloude2e tests can't run.
mage docker:image now uses the DOCKER_IMAGE env var.
Fixes issue where change from make to mage, result in the loss of creating multiple platform images.
@prodsecmachine
Copy link
Copy Markdown

prodsecmachine commented Sep 3, 2025

🎉 Snyk checks have passed. No issues have been found so far.

security/snyk check is complete. No issues have been found. (View Details)

license/snyk check is complete. No issues have been found. (View Details)

@ebeahan ebeahan changed the title [81.8] backport #4912 #4985 #5000 #5075 [8.18] backport #4912 #4985 #5000 #5075 Sep 3, 2025
@michel-laterman
Copy link
Copy Markdown
Contributor Author

michel-laterman commented Sep 4, 2025

@pkoutsovasilis, for some reason the check-ci step is failing in buildkite but not on my local machine; i recall seeing something like this before but I don't remember how we resolved this, do you remember how to resolve this?

EDIT: I think it's because the mod list that is passed when generating the notice file does not have the linux,windows,darwin tags; in order to be sure I just checked out the magefile from main.

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 11, 2025

This pull request is now in conflicts. Could you fix it @michel-laterman? 🙏
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 backport/mage-8.18 upstream/backport/mage-8.18
git merge upstream/8.18
git push upstream backport/mage-8.18

@pchila pchila removed their request for review September 17, 2025 13:05
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 22, 2025

This pull request is now in conflicts. Could you fix it @michel-laterman? 🙏
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 backport/mage-8.18 upstream/backport/mage-8.18
git merge upstream/8.18
git push upstream backport/mage-8.18

@elastic-sonarqube
Copy link
Copy Markdown

Quality Gate failed Quality Gate failed

Failed conditions
1 Security Hotspot

See analysis details on SonarQube

@michel-laterman michel-laterman merged commit 44a978c into elastic:8.18 Sep 24, 2025
7 of 8 checks passed
@michel-laterman michel-laterman deleted the backport/mage-8.18 branch September 24, 2025 23:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team tech debt

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants