-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
[WFLY-19062] Add preview stability support for Jakarta MVC to standard WildFly #17766
Conversation
@@ -83,7 +83,13 @@ public abstract class LayersTestBase { | |||
* Included in the return value of {@link #getExpectedUnusedInAllLayers()} | |||
* only when testing provisioning from the wildfly feature pack. | |||
*/ | |||
public static final String[] NO_LAYER_WILDFLY = {}; | |||
public static final String[] NO_LAYER_WILDFLY = { | |||
// Preview stability 'mvc-krazo' layer cannot be provisioned in OOTB standard wildfly |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When reading the comment, I thought at default standalone config. <perhaps adding a mention of layer.
testsuite/layers-expansion/pom.xml
Outdated
@@ -760,6 +760,7 @@ | |||
<layer>messaging-activemq</layer> | |||
<layer>micrometer</layer> | |||
<layer>mod_cluster</layer> | |||
<layer>mvc-krazo</layer> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps add a comment that says that being preview, nothing is provisioned although present. I understand that this comment would have to be removed when promoting this subsystem.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This one is a mistake. It should not be in this execution until it will actually be provisioned. Adding it here would be part of promoting the feature to community.
But commenting it out with a comment is better than deleting it. :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. (I moved the whole thing lower into the section with 'wildfly' FP only layers.)
testsuite/layers-expansion/pom.xml
Outdated
@@ -869,6 +870,7 @@ | |||
<layer>messaging-activemq</layer> | |||
<layer>micrometer</layer> | |||
<layer>mod_cluster</layer> | |||
<layer>mvc-krazo</layer> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps add a comment that says that being preview, nothing is provisioned although present. I understand that this comment would have to be removed when promoting this subsystem.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is provisioned as this execution uses wildfly-preview; i'll check.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that is the wildfly full all layers for HA.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I misread where in the code this line is. +1 -- this is the same as your other comment above and I'll do the same re commenting it out.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jfdenise Done. (I moved the whole thing lower into the section with 'wildfly' FP only layers.)
Pasting from https://issues.redhat.com/browse/WFLY-19062:
👍 That makes sense! |
boms/common-ee/pom.xml
Outdated
@@ -4808,6 +4808,37 @@ | |||
<version>${version.org.reactivestreams}</version> | |||
</dependency> | |||
|
|||
<dependency> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should non-EE artifacts be added to boms/common-ee or boms/common-expansion?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@scottmarlow Non-EE artifacts can go in common-ee. But I realize now these particular ones should be in common-expansion not common-ee.
The 'ee' refers to the 'wildfly-ee' feature pack, which is much more than EE; it's just the name we chose for the 'base' FP back in the WF 19/20 days we when split out the 'expansion' stuff. Down stream the wildfly-ee feature pack becomes the 'eap' feature pack used for base EAP (which is much more the Jakarta EE), while the 'wildfly' feature pack becomes the 'eap-xp' FP used for EAP XP. Upstream I refer to things specific to the 'wildfly' feature pack (boms, testsuite modules etc) as 'expansion'. But the feature pack itself is just 'wildfly' because in community 99%+ of people only deal with that FP directly, with wildfly-ee as an internal detail.
The boms/xxx-ee modules are meant to relate to wildfly-ee, while boms/xxx-expansion relate to the 'wildfly' feature pack. These deps are only relevant to the 'wildfly' FP so I will move them to boms/common-expansion.
Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@scottmarlow I've moved these to common-expansion. While doing it I realized one of them wasn't needed at all so I removed that.
When doing that I also rebased on current main and took the opportunity to squash down from three commits to two.
Pasting from eclipse-ee4j/krazo#352:
@erdlet could it make sense for the WildFly project to run the Eclipse Krazo TCK against the https://github.com/eclipse-ee4j/krazo/tree/master/tck? Perhaps via the https://ci.eclipse.org/krazo/job/tck-wildfly job? |
Hi @scottmarlow thanks for integratin Krazo into Wildfly. TBH I retired from Krazo,so I guess its better to ask @ivargrimstad or @chkal. Sorry that I can't help you more |
@scottmarlow We have a TCK runner for this: https://github.com/wildfly-extras/mvc-krazo-feature-pack/tree/main/testsuite/tck That can be run against any WildFly release by passing system props to maven. The README in that module describes that. Snapshots can be tested locally that way. WildFly Preview 31 passes that, and I'm confident this PR does too. (An earlier variant did but I've tweaked some irrelevant stuff since I last tried.) I'm going to add a github action to that repo that will take a GH repo and tag/branch/sha as params, values meant to point to a wildfly repo. It will then check out that repo and build wildfly, making the resulting maven repository from the build available to a call to run the TCK. This will allow testing WF snapshots on GH instead of locally. That action could then be called from some broader infrastructure, e.g. if we wanted some action in wildfly-tck-runners to call everything, or perhaps a jenkins job. Note that I expect that repo may some day go away and the various pieces get moved, e.g. the bulk of it into this repo and the tck runner as a subtree in wildfly-tck-runners. But for now I like having it external as it gives me experience of the issues that come with maintaining something like this externally to the main WF code base. That something we'll be doing more of over time and it's good to build expertise. |
Just adding the "Critical" label so we can discuss. |
This primarily consists of shifting the mvc-krazo extension/subsystem integration from the wildfly-preview feature pack to the wildfly feature pack Manual mode testing is added since the server needs to run at --stability=preview. This will be converted to the basic testsuite once WFCORE-6728 is available for use
TCK results are here: https://github.com/wildfly-extras/mvc-krazo-feature-pack/actions/runs/8539883565/ |
Nice to see the TCK tests passed! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I"m approving this because I don't think my comments should blocking merging and can be changed in a follow up PR.
@Test | ||
@InSequence(-1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should not block merging, but any reason not to do this in a @Before
method?
public void test() throws Exception { | ||
// TODO migrate this to testsuite/integration/basic and inject the http listener URL | ||
//URL url = new URL(this.url.toExternalForm() + "mvc-smoke/test"); | ||
URL url = new URL("http", TestSuiteEnvironment.getServerAddress(), 8080, "/" + DEPLOYMENT_NAME + "/mvc-smoke/test"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be:
URL url = new URL("http", TestSuiteEnvironment.getHttpAddress(), TestSuiteEnvironment.getHttpPort(), "/" + DEPLOYMENT_NAME + "/mvn-smoke/test");
@Test | ||
@InSequence(10) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as above having this as an @After
should work.
https://issues.redhat.com/browse/WFLY-19062
This also incorporates fixes for:
https://issues.redhat.com/browse/WFLY-19170 (see also #17764)
https://issues.redhat.com/browse/WFLY-19163 (see also #17753)
More information about the wildfly-bot[bot]