Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert x-pack fleet project to new test framework #125743

Merged
merged 12 commits into from
Mar 31, 2025

Conversation

mark-vieira
Copy link
Contributor

Converts :x-pack:plugin:fleet to new testing framework and removes dependency on default distribution. Also collapses the :qa:rest project into the main module project for simplicity.

@mark-vieira mark-vieira added >test Issues or PRs that are addressing/adding tests :Delivery/Build Build or test infrastructure >refactoring auto-backport Automatically create backport pull requests when merged v8.18.1 v8.19.0 v9.0.1 labels Mar 27, 2025
@mark-vieira mark-vieira requested a review from a team as a code owner March 27, 2025 00:27
@elasticsearchmachine elasticsearchmachine added Team:Delivery Meta label for Delivery team v9.1.0 labels Mar 27, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

@mark-vieira
Copy link
Contributor Author

@breskeby as I mentioned in slack, I've collapsed the :qa:rest project under :x-pack:plugin:fleet into the main project. All it contained was yaml tests and the main project didn't have any so I just added them there. Not sure why there were split up.

@mark-vieira mark-vieira requested a review from breskeby March 27, 2025 00:29

testClusters.configureEach {
testDistribution = 'DEFAULT'
Copy link
Contributor

Choose a reason for hiding this comment

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

nice

tasks.named('yamlRestCompatTest') {
usesDefaultDistribution("to be triaged")
}
if (buildParams.inFipsJvm){
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you forgot this to be ported to the fleet project build script?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like moving to the integ-test distro sorted this out.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've added the fips label to ensure we test this still works.

@mark-vieira mark-vieira added the :Security/FIPS Running ES in FIPS 140-2 mode label Mar 27, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-security (Team:Security)

@elasticsearchmachine elasticsearchmachine added the Team:Security Meta label for security team label Mar 27, 2025
@elasticsearchmachine elasticsearchmachine added the serverless-linked Added by automation, don't add manually label Mar 27, 2025
@mark-vieira mark-vieira merged commit e75891e into elastic:main Mar 31, 2025
22 checks passed
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.18 Commit could not be cherrypicked due to conflicts
8.x Commit could not be cherrypicked due to conflicts
9.0 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 125743

mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Mar 31, 2025
(cherry picked from commit e75891e)

# Conflicts:
#	x-pack/plugin/fleet/qa/rest/build.gradle
#	x-pack/plugin/fleet/qa/rest/src/yamlRestTest/resources/roles.yml
#	x-pack/plugin/fleet/roles.yml
#	x-pack/plugin/fleet/src/yamlRestTest/java/org/elasticsearch/xpack/fleet/FleetRestIT.java
#	x-pack/plugin/fleet/src/yamlRestTest/resources/roles.yml
@mark-vieira
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.x
9.0
8.18

Questions ?

Please refer to the Backport tool documentation

mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Mar 31, 2025
(cherry picked from commit e75891e)

# Conflicts:
#	x-pack/plugin/fleet/qa/rest/build.gradle
#	x-pack/plugin/fleet/qa/rest/src/yamlRestTest/resources/roles.yml
#	x-pack/plugin/fleet/roles.yml
#	x-pack/plugin/fleet/src/yamlRestTest/java/org/elasticsearch/xpack/fleet/FleetRestIT.java
#	x-pack/plugin/fleet/src/yamlRestTest/resources/roles.yml
mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Mar 31, 2025
(cherry picked from commit e75891e)

# Conflicts:
#	x-pack/plugin/fleet/qa/rest/build.gradle
elasticsearchmachine pushed a commit that referenced this pull request Mar 31, 2025
(cherry picked from commit e75891e)

# Conflicts:
#	x-pack/plugin/fleet/qa/rest/build.gradle
elasticsearchmachine added a commit that referenced this pull request Mar 31, 2025
…125977)

* Convert x-pack fleet project to new test framework (#125743)

(cherry picked from commit e75891e)

# Conflicts:
#	x-pack/plugin/fleet/qa/rest/build.gradle
#	x-pack/plugin/fleet/qa/rest/src/yamlRestTest/resources/roles.yml
#	x-pack/plugin/fleet/roles.yml
#	x-pack/plugin/fleet/src/yamlRestTest/java/org/elasticsearch/xpack/fleet/FleetRestIT.java
#	x-pack/plugin/fleet/src/yamlRestTest/resources/roles.yml

* [CI] Auto commit changes from spotless

---------

Co-authored-by: elasticsearchmachine <[email protected]>
elasticsearchmachine added a commit that referenced this pull request Mar 31, 2025
…125979)

* Convert x-pack fleet project to new test framework (#125743)

(cherry picked from commit e75891e)

# Conflicts:
#	x-pack/plugin/fleet/qa/rest/build.gradle
#	x-pack/plugin/fleet/qa/rest/src/yamlRestTest/resources/roles.yml
#	x-pack/plugin/fleet/roles.yml
#	x-pack/plugin/fleet/src/yamlRestTest/java/org/elasticsearch/xpack/fleet/FleetRestIT.java
#	x-pack/plugin/fleet/src/yamlRestTest/resources/roles.yml

* [CI] Auto commit changes from spotless

---------

Co-authored-by: elasticsearchmachine <[email protected]>
afoucret pushed a commit to afoucret/elasticsearch that referenced this pull request Apr 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Automatically create backport pull requests when merged :Delivery/Build Build or test infrastructure >refactoring :Security/FIPS Running ES in FIPS 140-2 mode serverless-linked Added by automation, don't add manually Team:Delivery Meta label for Delivery team Team:Security Meta label for security team >test Issues or PRs that are addressing/adding tests v8.18.1 v8.19.0 v9.0.1 v9.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants