[WFLY-18578] Allow channel-based overriding of the org.jboss.as.produ… #17248

bstansberry · 2023-10-04T21:13:18Z

…ct data

Use artifacts to store the JBoss-Product-Release-Name and JBoss-Product-Release-Version MANIFEST.MF entries to make it possible to update that info via a channel

https://issues.redhat.com/browse/WFLY-18578

Incorporates https://issues.redhat.com/browse/WFLY-18791 as it's the foundation for the test.

@jmesnil @wolfc @spyrkob @jfdenise @darranl @bmaxwell whether we decide to make use of this capability in the near term or not, I think this is the correct way to do this. The old approach was a mix of pom magic, galleon magic and JBoss Modules magic. Too much magic.

github-actions · 2023-10-04T21:28:16Z

Dependency Tree Analyzer Output:

New Dependencies:

org.wildfly:wildfly-ee-feature-pack-product-conf:jar:31.0.0.Beta1-SNAPSHOT:compile
org.wildfly:wildfly-feature-pack-product-conf:jar:31.0.0.Beta1-SNAPSHOT:compile

CC @wildfly/prod

spyrkob · 2023-10-05T07:59:07Z

Is the expectation that if we wanted to separate the reported version from build version, we'd build the product-conf jar separately and inject it into the channel?

jfdenise · 2023-10-05T11:22:22Z

@bstansberry , I tried locally, I opened PR against your branch for small adjustments: bstansberry#65

bstansberry · 2023-10-05T13:11:28Z

Is the expectation that if we wanted to separate the reported version from build version, we'd build the product-conf jar separately and inject it into the channel?

@spyrkob Yes. Getting all that going would be the harder part; this part is simpler.

bstansberry · 2023-10-05T13:13:09Z

@bstansberry , I tried locally, I opened PR against your branch for small adjustments: bstansberry#65

Thanks, @jfdenise -- I merged that.

bstansberry · 2023-10-05T13:18:14Z

@spyrkob Note that there are other ways we could approach things; this is just one and it involves the least change to the main server code. We can discuss options elsewhere. I decided to push this forward since looking at how we make this data available currently is overly magical and it's valid to update it.

bstansberry · 2023-10-31T21:16:19Z

I've found the cause of the Windows failures.

https://issues.redhat.com/browse/WFGP-259

I'll put a hold on this pending integration of a WFGP release with that fixed.

bstansberry · 2023-11-03T21:56:53Z

I'll retest once #17368 is merged.

bstansberry · 2023-11-30T22:46:24Z

boms/common-expansion/pom.xml

-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>


Note that this change was off-topic. It's a duplicate entry in the bom that maven was complaining about, so I removed it.

jfdenise · 2023-12-01T09:24:23Z

@bstansberry , I am wandering if we really need the channel artifact. What the WildFly Maven plugin is using is the channel manifest (maven coordinates or URL). The maven repos in use to build the channel are the ones coming from the maven context.

bstansberry · 2023-12-01T16:28:34Z

@jfdenise Yeah, I agree. I added these (in the similar PR in core) before I realized they were irrelevant.

WDYT though about just having the 'channel' module and have it produce two artifacts? Except the -channel.yaml artifact would be commented out. I don't much like having two modules, and different artifactIds.

The context here is part of this is trying to lay the groundwork for a possible future day when we'd actually deploy a channel as part of a release. Might as well get things set up correctly. BUT, that's a side goal; doesn't block anything. The point here is just to set up test infrastructure.

bstansberry · 2023-12-01T21:24:25Z

@jfdenise I combined the channel.yaml and manifest.yaml stuff into a single maven module per FP. I disabled attaching the channel.yaml as an artifact for now.

jfdenise · 2023-12-04T12:28:10Z

@bstansberry , the Maven plugin that builds the feature-pack deploys the channel (https://github.com/wildfly/galleon-plugins/blob/main/maven-plugin/src/main/java/org/wildfly/galleon/maven/AbstractFeaturePackBuildMojo.java#L398). We should make that optional and disable it in WildFly. Perhaps that it could be enough and the channel module not required?

bstansberry · 2023-12-05T16:51:43Z

@jfdenise I'm not sure whether that needs to be configurable or not. Well, it does, but it doesn't seem super urgent. However, we should never promote (e.g. blogs, docs etc) such a manifest independent of a conscious decision by the relevant project that that's what it wants to do. We don't have that for WF or WF Core.

I'd prefer to leave the module in WF. I don't like the artifactId of our feature packs and if we started promoting a WF channel I'd need convincing to use that artifactId.

jfdenise · 2023-12-05T16:56:21Z

@bstansberry , thank-you. I created https://issues.redhat.com/browse/WFGP-262 to track it.

spyrkob · 2023-12-06T08:40:39Z

ee-feature-pack/channel/src/main/resources/wildfly-ee-channel.yaml

+  - id: "jboss-public"
+    url: "https://repository.jboss.org/nexus/content/groups/public/"
+manifest:
+  maven: "org.wildfly:${project.artifactId}:${project.version}"


the maven coordinates should be broken up like:

manifest: maven: groupId: "org.wildfly" artifactId: "${project.artifactId}" version: "${project.version}"

Also does the channel need to define the manifest version? I think it would make more sense to have the major version included into the artifactId of the manifest so the updates can be consumed if needed

@spyrkob I fixed the formatting; thanks.

Re the manifest version, I'd prefer to address that later. Right now this is just a piece of test infrastructure, and I really need to move on from this testing effort to focus elsewhere. But for sure we need to get this right when we start to publish channels.

spyrkob · 2023-12-12T10:30:36Z

pom.xml

+                <artifactId>wildfly-channel</artifactId>
+                <version>${full.maven.version}</version>
+                <type>yaml</type>
+                <classifier>channel</classifier>


since the channels are not attached to the reactor, I think this dependency could be removed? Or does it make sense to keep it in case we need to attache the channels in future?

Yeah, that can be removed. When I started all this I added some random off-topic bits in case we decided to push and deploy channels as part of WF 31. But now it's right at the deadline and we need more discussion before doing that, so these can be removed.

spyrkob · 2023-12-12T10:48:54Z

testsuite/integration/manualmode/pom.xml

+                                    <artifactId>wildfly-ee-galleon-pack</artifactId>
+                                    <version>${ee.maven.version}</version>
+                                </feature-pack>
+                                <feature-pack>


Is it necessary to include prospero feature pack? IIUC the test only verifies the interaction between wildfly channel and the product-conf-override-manifest.yaml. The integration tests in prospero already verify installing Wildfly + prospero feature pack.

Right; @spyrkob -- that can be removed. That's left over from when I also used this execution for the testing I later moved into wildfly/wildfly-core#5724.

…ure packs Disable attaching the channel.yaml files until there is a concrete need for them.

…ct data Use artifacts to store the JBoss-Product-Release-Name and JBoss-Product-Release-Version MANIFEST.MF entries to make it possible to update that info via a channel

…ng or product artifact with layers

…ure packs

…r controls the reported name/version

…nments

bstansberry · 2023-12-12T23:25:19Z

Thanks @spyrkob -- I believe I've addressed the issues you raised.

spyrkob

LGTM!

bstansberry · 2023-12-13T14:48:04Z

Thanks @spyrkob and @jfdenise!

bstansberry force-pushed the WFLY-18758 branch 2 times, most recently from b2580fd to d336474 Compare October 4, 2023 21:19

bstansberry added the 30.x label Oct 4, 2023

github-actions bot added the deps-changed Dependencies have been checked, and there are changes highlighted in a comment label Oct 4, 2023

bstansberry added 31.x and removed 30.x labels Oct 18, 2023

bstansberry force-pushed the WFLY-18758 branch from b8a666d to 27f1ff6 Compare October 30, 2023 20:44

bstansberry added the hold PR should not be merged for some reason. label Oct 31, 2023

bstansberry force-pushed the WFLY-18758 branch from 1ed34dc to fda0e7e Compare November 6, 2023 14:57

bstansberry added rebase-this PR has a merge conflict. and removed hold PR should not be merged for some reason. 31.x labels Nov 7, 2023

bstansberry force-pushed the WFLY-18758 branch from fda0e7e to ea09b09 Compare November 14, 2023 17:55

bstansberry removed the rebase-this PR has a merge conflict. label Nov 21, 2023

bstansberry force-pushed the WFLY-18758 branch from ea09b09 to c35bb4d Compare November 30, 2023 22:21

bstansberry commented Nov 30, 2023

View reviewed changes

bstansberry force-pushed the WFLY-18758 branch from c35bb4d to 4fd1c0d Compare December 1, 2023 00:04

bstansberry force-pushed the WFLY-18758 branch 2 times, most recently from 1de1113 to bc44603 Compare December 1, 2023 23:31

bstansberry force-pushed the WFLY-18758 branch from bc44603 to c7310ef Compare December 3, 2023 23:29

bstansberry force-pushed the WFLY-18758 branch from 7df8727 to f8d9b5c Compare December 4, 2023 17:09

bstansberry mentioned this pull request Dec 5, 2023

[WFLY-18817] Test that provisioning channel information is logged at boot #17470

Closed

bstansberry force-pushed the WFLY-18758 branch 2 times, most recently from a5036d5 to c299d5f Compare December 6, 2023 01:33

spyrkob reviewed Dec 6, 2023

View reviewed changes

bstansberry force-pushed the WFLY-18758 branch from c299d5f to 76aacf9 Compare December 6, 2023 12:45

bstansberry mentioned this pull request Dec 7, 2023

[WFLY-18791][WFLY-18792][WFLY-18793] Channel-based provisioning testing #17473

Merged

bstansberry force-pushed the WFLY-18758 branch 2 times, most recently from 307ca67 to 1f3f74c Compare December 11, 2023 19:02

spyrkob reviewed Dec 12, 2023

View reviewed changes

bstansberry and others added 6 commits December 12, 2023 16:55

[WFLY-18791] Create channel and manifest artifacts for the three feat…

b74cff7

…ure packs Disable attaching the channel.yaml files until there is a concrete need for them.

[WFLY-18578] Allow channel-based overriding of the org.jboss.as.produ…

cbec066

…ct data Use artifacts to store the JBoss-Product-Release-Name and JBoss-Product-Release-Version MANIFEST.MF entries to make it possible to update that info via a channel

[WFLY-18758] Exclude ee product artifact for full. Enforce provisioni…

0dd8b21

…ng or product artifact with layers

[WFLY-18791] Create channel and manifest artifacts for the three feat…

16eeebf

…ure packs

[WFLY-18758] Add tests that a channel override of the product conf ja…

8b7e8f9

…r controls the reported name/version

[WFLY-18758] Disable ChannelProvisioningTestCase in unsuitable enviro…

c7b3207

…nments

bstansberry force-pushed the WFLY-18758 branch from 1f3f74c to c7b3207 Compare December 12, 2023 23:10

spyrkob approved these changes Dec 13, 2023

View reviewed changes

bstansberry added the ready-for-merge Only for use by those with merge permissions! label Dec 13, 2023

bstansberry merged commit 4c82ed6 into wildfly:main Dec 13, 2023
15 checks passed

bstansberry deleted the WFLY-18758 branch December 13, 2023 14:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WFLY-18578] Allow channel-based overriding of the org.jboss.as.produ… #17248

[WFLY-18578] Allow channel-based overriding of the org.jboss.as.produ… #17248

bstansberry commented Oct 4, 2023 •

edited

github-actions bot commented Oct 4, 2023 •

edited

spyrkob commented Oct 5, 2023

jfdenise commented Oct 5, 2023

bstansberry commented Oct 5, 2023

bstansberry commented Oct 5, 2023

bstansberry commented Oct 5, 2023

bstansberry commented Oct 31, 2023 •

edited

bstansberry commented Nov 3, 2023 •

edited

bstansberry Nov 30, 2023

jfdenise commented Dec 1, 2023

bstansberry commented Dec 1, 2023

bstansberry commented Dec 1, 2023

jfdenise commented Dec 4, 2023

bstansberry commented Dec 5, 2023

jfdenise commented Dec 5, 2023

spyrkob Dec 6, 2023

bstansberry Dec 6, 2023

spyrkob Dec 12, 2023

bstansberry Dec 12, 2023

bstansberry Dec 12, 2023

spyrkob Dec 12, 2023

bstansberry Dec 12, 2023

bstansberry Dec 12, 2023

bstansberry commented Dec 12, 2023

spyrkob left a comment

bstansberry commented Dec 13, 2023

[WFLY-18578] Allow channel-based overriding of the org.jboss.as.produ… #17248

[WFLY-18578] Allow channel-based overriding of the org.jboss.as.produ… #17248

Conversation

bstansberry commented Oct 4, 2023 • edited

github-actions bot commented Oct 4, 2023 • edited

spyrkob commented Oct 5, 2023

jfdenise commented Oct 5, 2023

bstansberry commented Oct 5, 2023

bstansberry commented Oct 5, 2023

bstansberry commented Oct 5, 2023

bstansberry commented Oct 31, 2023 • edited

bstansberry commented Nov 3, 2023 • edited

Choose a reason for hiding this comment

jfdenise commented Dec 1, 2023

bstansberry commented Dec 1, 2023

bstansberry commented Dec 1, 2023

jfdenise commented Dec 4, 2023

bstansberry commented Dec 5, 2023

jfdenise commented Dec 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bstansberry commented Dec 12, 2023

spyrkob left a comment

Choose a reason for hiding this comment

bstansberry commented Dec 13, 2023

bstansberry commented Oct 4, 2023 •

edited

github-actions bot commented Oct 4, 2023 •

edited

bstansberry commented Oct 31, 2023 •

edited

bstansberry commented Nov 3, 2023 •

edited