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

Reapply "Making yaml tests version selector parser compatible with versions returned by Build" #100953

Merged

Conversation

ldematte
Copy link
Contributor

Reapply #100794

This will need to be merged (again) after #100947 and then be followed by #100746 OR follow quickly #100746 to avoid disruption in serverless.

@ldematte ldematte marked this pull request as ready for review October 17, 2023 12:32
@elasticsearchmachine elasticsearchmachine added the needs:triage Requires assignment of a team area label label Oct 17, 2023
@ldematte ldematte added :Core/Infra/REST API REST infrastructure and utilities >refactoring and removed needs:triage Requires assignment of a team area label labels Oct 17, 2023
@elasticsearchmachine elasticsearchmachine added the Team:Core/Infra Meta label for core/infra team label Oct 17, 2023
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

Copy link
Contributor

@williamrandolph williamrandolph left a comment

Choose a reason for hiding this comment

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

I think we can simplify a little bit here, but I may be nitpicking and overall this looks good to me.

Version version = Version.fromString(node.getVersion());
boolean skip = skipVersionRanges.stream().anyMatch(v -> v.contains(version));
if (false == skip) {
if (nodeMatcher.test(versionString) == false) {
Copy link
Contributor

Choose a reason for hiding this comment

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

If we do replace("-SNAPSHOT", "") here, the possible matchers both get simplified.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it could become a simple string equals. Same as above, I will change it - it should work, and if not CI test failures will tell us.

@ldematte
Copy link
Contributor Author

@elasticmachine rerun elasticsearch-ci/check-serverless-submodule

@ldematte ldematte merged commit 482cf3b into elastic:main Oct 24, 2023
13 checks passed
@ldematte ldematte deleted the reapply-compatible-version-parsing-yaml-tests branch October 24, 2023 11:46
@ldematte
Copy link
Contributor Author

Thank you William!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Core/Infra/REST API REST infrastructure and utilities >refactoring Team:Core/Infra Meta label for core/infra team test-update-serverless v8.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants