Skip to content

Conversation

@labkey-chrisj
Copy link
Contributor

@labkey-chrisj labkey-chrisj commented Apr 22, 2025

Rationale

This change updates the gradle plugin to accept system.labkey.contextPath values (via command line or set as TC property) and write the specified value to application.settings at the context.contextPath key.
This work is part of this story https://github.com/LabKey/kanban/issues/664 , the requirement is that we be able to test on TC with the server's contextPath setting set.

Related Pull Requests

(related server pr) LabKey/server#1050

Changes

pass contextPath value through

@labkey-chrisj labkey-chrisj self-assigned this Apr 22, 2025
@labkey-chrisj labkey-chrisj changed the title Fb server context Support testing with serverContext on TeamCity Apr 22, 2025
@labkey-chrisj
Copy link
Contributor Author

labkey-chrisj commented Apr 22, 2025

This run on TeamCity was successful in setting the serverContext (default value: /) to /labkey
https://teamcity.labkey.org/buildConfiguration/bt7/3480882?buildTab=log&focusLine=77&logView=linear&linesState=570
image
Unfortunately however, with that value set there are problems waiting for startup

Update: managed to figure it out- this run successfully uncomments and sets the contextpath value in the server application.properties: https://teamcity.labkey.org/buildConfiguration/bt7/3480884?buildTab=overview

It appears that several tests in GpatAssayTest failed with this setting, tho- it was the first test class, but the telltales of Issue 51721 aren't in evidence: icons appear in the html as expected- but the failures are all Ext4 client errors. Wonder if the way we check the health of the server on startup isn't playing well with having a contextpath set?

Copy link
Contributor

@labkey-susanh labkey-susanh left a comment

Choose a reason for hiding this comment

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

Please update the README.md file with a note about what has changed here. You can update the release version to 6.2.0 and the release date to the day you merge your change.

build.gradle Outdated

group = 'org.labkey.build'
project.version = "6.2.0-SNAPSHOT"
project.version = "6.2.0"
Copy link
Member

Choose a reason for hiding this comment

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

The version should be chaged to 6.3.0-SNAPSHOT before merging.
I'm not sure that this should have ever been set to a non-snapshot version in the branch. I usually merge it with the next snapshot version then @labkey-susanh publishes the release version (not sure exactly what that process is).

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, that's the process. Once this gradlePlugins branch is merged (using the next snapshot version), I'll publish the 6.2.0 version and you can update your server branch to use that version and merge it.

Copy link
Contributor Author

@labkey-chrisj labkey-chrisj Apr 23, 2025

Choose a reason for hiding this comment

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

OK, version here is now 6.3.0-SNAPSHOT
...wait. Did you mean I should make a new snapshot branch based on this FB with that version?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, this branch is fine. This changing of the project.version property to 6.3.0-SNAPSHOT is just in preparation for merging to develop. When publishing the plugin, I'll make a separate branch that populates this with the release version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you!

more succinct change summary

Co-authored-by: Trey Chadick <tchad@labkey.com>
@labkey-chrisj labkey-chrisj merged commit 26defe5 into develop Apr 23, 2025
1 check passed
@labkey-chrisj labkey-chrisj deleted the fb_serverContext branch April 23, 2025 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants