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

Versionless prep for install #28981

Merged
merged 1 commit into from
Jul 10, 2024

Conversation

cbridgha
Copy link
Member

@cbridgha cbridgha commented Jul 3, 2024

Initial code changes preparing for passing "platforms" from server.xml in install scenarios

  • Changes to InstallUtils that reads the server.xml for a list of features, now returns both features and platforms lists

  • FeatureUtility propagates these values for the "InstallServerAction"

  • Added tests for passing platforms and versionless features (Although disabled until all code is in place)

  • Added unit test for Server Asses reading features and platforms

Previous question around also passing EnvVar values... this is not needed, as the Kernel resolver does all of this work, and only needs the new "platforms" list to help determine what feature set to install.

Repository changes are also coming, and we'll need to change the TODO in the InstalMap class to also pass platform list.

For now this will put the parsing, and tests in place...

@LibbyBot
Copy link

LibbyBot commented Jul 3, 2024

Code analysis and actions

DO NOT DELETE THIS COMMENT.
  • 8 product code files were changed.

  • Please describe in a separate comment how you tested your changes.

  • 2 FAT files were changed, added, or removed.

  • Check that the build did not break the affected FAT suite(s).

@cbridgha cbridgha force-pushed the InstallVersionless branch 3 times, most recently from 4a1bdc2 to e942d38 Compare July 8, 2024 01:44
@cbridgha
Copy link
Member Author

cbridgha commented Jul 8, 2024

#build

@LibbyBot
Copy link

LibbyBot commented Jul 8, 2024

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_b9UW4DzDEe-Hn95lLM_tGQ

Target locations of links might be accessible only to IBM employees.

@LibbyBot
Copy link

LibbyBot commented Jul 8, 2024

We could not perform your request. We allow builds for authorized users and trusted code only.

1 similar comment
@LibbyBot
Copy link

LibbyBot commented Jul 8, 2024

We could not perform your request. We allow builds for authorized users and trusted code only.

@cbridgha
Copy link
Member Author

cbridgha commented Jul 8, 2024

#build

@LibbyBot
Copy link

LibbyBot commented Jul 8, 2024

We could not perform your request. We allow builds for authorized users and trusted code only.

@cbridgha cbridgha self-assigned this Jul 8, 2024
@cbridgha
Copy link
Member Author

cbridgha commented Jul 8, 2024

#build

@LibbyBot
Copy link

LibbyBot commented Jul 8, 2024

Your personal pipeline request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=8ced16a8-07e0-43a3-b4ae-ce3171e02a88

Target locations of links might be accessible only to IBM employees.

@LibbyBot
Copy link

LibbyBot commented Jul 8, 2024

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_ZFZKcD1mEe-Hn95lLM_tGQ

Target locations of links might be accessible only to IBM employees.

@LibbyBot
Copy link

LibbyBot commented Jul 8, 2024

Copy link
Contributor

@jjiwooLim jjiwooLim left a comment

Choose a reason for hiding this comment

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

Implementation looks good! Couple comments on the tests.

Comment on lines +161 to +163
* Test the install of versionless servlet from maven central. Multi-version is not
* supported with installServerFeature as it cannot be installed to same
* resource.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* Test the install of versionless servlet from maven central. Multi-version is not
* supported with installServerFeature as it cannot be installed to same
* resource.
* Test the install of versionless servlet from maven central. "jakartaee-10.0" and "servlet" configuration should install servlet-6.0.

Copy link
Member Author

Choose a reason for hiding this comment

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

We'll need to time any special tetss that actually go out to Maven Central - because these haven't been published yet

String[] param1s = { "installServerFeatures", "serverX", "--verbose" };
ProgramOutput po = runFeatureUtility(METHOD_NAME, param1s);

checkCommandOutput(po, 21, "CWWKF1405E", null);
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
checkCommandOutput(po, 21, "CWWKF1405E", null);
String[] filesList = { "/lib/features/com.ibm.websphere.appserver.servlet-6.0.mf" };
checkCommandOutput(po, 0, null, filesList);

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks - these tests will be enabled and fixed after the repo PR is finished... probably a few days from now...

File serverXmlFile = sa.getServerXmlFile();
FeaturesPlatforms fp = InstallUtils.getFeatures(serverXmlFile.getAbsolutePath(), serverXmlFile.getName(), new HashSet<String>());
assertTrue(fp.getFeatures().containsAll(Arrays.asList("genericCoreFeature", "featureA-1.0", "featureB-1.0", "featureC-1.0")));
assertTrue(fp.getPlatforms().containsAll(Arrays.asList("jakartaee-10.0")));
Copy link
Contributor

Choose a reason for hiding this comment

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

publish/servers/serverA/server.xml should include

<platform>jakartaee-10.0</platfrom>

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

and this test does run in the build so we'll know soon if it passes. :)

Copy link
Contributor

Choose a reason for hiding this comment

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

sorry missed that earlier

@cbridgha
Copy link
Member Author

cbridgha commented Jul 9, 2024

#build

@LibbyBot
Copy link

LibbyBot commented Jul 9, 2024

Your personal pipeline request is at https://libh-proxy1.fyre.ibm.com/cognitive/pipelineAnalysis.html?uuid=4945f4ad-3fde-456c-a2fe-cc731c7851a7

Target locations of links might be accessible only to IBM employees.

@LibbyBot
Copy link

LibbyBot commented Jul 9, 2024

Your personal build request is at https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_kfPv0D4wEe-Hn95lLM_tGQ

Target locations of links might be accessible only to IBM employees.

@LibbyBot
Copy link

The build cbridgha-28981-20240709-0834
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_Qq-KUD3_Ee-Hn95lLM_tGQ
completed and has errors or failures.

For help analyzing your personal build, go to https://libh-proxy1.fyre.ibm.com/cognitive/buildAnalysis.html?uuid=_Qq-KUD3_Ee-Hn95lLM_tGQ

Copy link
Contributor

@jjiwooLim jjiwooLim left a comment

Choose a reason for hiding this comment

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

lgtm!

@cbridgha cbridgha merged commit 04199c4 into OpenLiberty:integration Jul 10, 2024
1 check failed
@LibbyBot
Copy link

The build cbridgha-28981-20240709-1427
https://wasrtc.hursley.ibm.com:9443/jazz/resource/itemOid/com.ibm.team.build.BuildResult/_kfPv0D4wEe-Hn95lLM_tGQ
completed and has errors or failures.

For help analyzing your personal build, go to https://libh-proxy1.fyre.ibm.com/cognitive/buildAnalysis.html?uuid=_kfPv0D4wEe-Hn95lLM_tGQ

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants