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

[WFCORE-7011] Use 'default' stability level when the remote host controller do not advertise its current stability level #6204

Merged
merged 1 commit into from
Nov 29, 2024

Conversation

yersan
Copy link
Collaborator

@yersan yersan commented Sep 27, 2024

Built on top of #6201

Jira issue: https://issues.redhat.com/browse/WFCORE-7011

It is expected that mixed domain tests fail with this change. I opened it as a draft since this change still requires some discussions to decide whether we want to allow DC -- HC mixed domains under community -- default stability levels

@wildfly-ci

This comment was marked as outdated.

Copy link

There has been no activity on this PR for 45 days. It will be auto-closed after 90 days.

@yersan
Copy link
Collaborator Author

yersan commented Nov 27, 2024

Just rebased on top of the current main and fixed ServerEnvironmentTestCase#testAliasNotWorkingInDefaultStability. @pferraro Could you approve from your side? I would like to release this this week to unlock pending work with the mixed domains in upstream. This one will be merged as the last PR for the release since it breaks the TS until the WildFly counterpart gets merged

After that, we will continue adding a WildFly for the mixed domains and follow with #6214

@wildfly-ci

This comment was marked as outdated.

@wildfly-ci

This comment was marked as outdated.

@wildfly-ci

This comment was marked as outdated.

@wildfly-ci

This comment was marked as outdated.

@wildfly-ci

This comment was marked as outdated.

@pferraro
Copy link
Contributor

Are you sure this branch is up to date? The git diff looks odd.

@yersan
Copy link
Collaborator Author

yersan commented Nov 27, 2024

Hi @pferraro , it is now. We do not need to get the ProductConf stability level at the Host registration process, so most of the "weird" changes shown in the diff are to remove the need to pass that variable through all the method calls to get it at the registration phase.

Then, some adjustments on some tests because I moved the default stability level for the tests to Community, which apparently makes more sense. We can continue using DEFAULT and let each test choose whatever it needs. Maybe that makes more sense.

Still in draft since I have not gotten the full CI feedback yet, but great if you can take a look at it is

@wildfly-ci

This comment was marked as outdated.

@wildfly-ci

This comment was marked as outdated.

@wildfly-ci

This comment was marked as outdated.

@wildfly-ci

This comment was marked as outdated.

@wildfly-ci

This comment was marked as outdated.

@wildfly-ci

This comment was marked as outdated.

@wildfly-ci

This comment was marked as off-topic.

@yersan yersan marked this pull request as ready for review November 27, 2024 20:43
@github-actions github-actions bot removed the Stale label Nov 28, 2024
@yersan
Copy link
Collaborator Author

yersan commented Nov 28, 2024

@pferraro I think this is ready to go with your review, galleon full failure is unrelated

Copy link
Contributor

@pferraro pferraro left a comment

Choose a reason for hiding this comment

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

Minor suggestion only.

this.defaultStability = Stability.DEFAULT;
this.stabilities = EnumSet.of(this.defaultStability);
this.defaultStability = Stability.COMMUNITY;
this.stabilities = Collections.unmodifiableSet(EnumSet.range(Stability.DEFAULT, Stability.COMMUNITY));
Copy link
Contributor

Choose a reason for hiding this comment

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

I would keep this logic internal to the Stability object.
e.g.

this.stabilities = EnumSet.allOf(Stability.class).stream().filter(this.defaultStability::enables).collect(Collectors.toUnmodifiableSet());

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@pferraro thanks for reviewing, done

Since that was the only pending fix, I am going to move on with it so I can prepare a release today

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Well, wait .... now I am wondering, I would expect to see the mixed domain integration tests failing with this PR in, since we will be assuming EAP 7.4 legacy host will be running in "default" stability level, hence the mixed domains should have failed because WildFly will be running by default in "community" stability level.

Looking ....

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ok, got it, I've realized today that full integration Jobs are ignoring the mixed domain tests because of a misconfiguration of those two Jobs (they are using JDK 17 but legacy JDK to launch the legacy servers is not configured). I'll fix them once we have integrated both this PR and the WildFly counterpart, so we can continue without breaking WildFly Core CI until the WildFly full gets merged.

@wildfly-ci

This comment was marked as off-topic.

@yersan yersan added ready-for-merge This PR is ready to be merged and fulfills all requirements and removed ready-for-merge This PR is ready to be merged and fulfills all requirements labels Nov 29, 2024
@yersan yersan merged commit 0a51ca7 into wildfly:main Nov 29, 2024
11 of 13 checks passed
@yersan yersan deleted the WFCORE-7011 branch November 29, 2024 10:04
@yersan
Copy link
Collaborator Author

yersan commented Nov 29, 2024

Thanks @pferraro

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge This PR is ready to be merged and fulfills all requirements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants