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

7112 payara5 aio #7114

Merged
merged 7 commits into from Aug 4, 2020
Merged

7112 payara5 aio #7114

merged 7 commits into from Aug 4, 2020

Conversation

pameyer
Copy link
Contributor

@pameyer pameyer commented Jul 22, 2020

What this PR does / why we need it:

switch docker-aio from glassfish to payara

Which issue(s) this PR closes:

Closes #7112

Special notes for your reviewer:

Deferred testing of / changes related to new install script (despite describing it as analogous to an issues that explicitly included testing the new installer); focused on API test suite.

Suggestions on how to test this:

Existing instructions for docker-aio should work unchanged; Server header from curl -i http://localhost:8083/api/info/version should report payara

Does this PR introduce a user interface change? If mockups are available, please link/include them here:

nope

Is there a release notes update needed for this change?:

nope

Additional documentation:

should be none necessary

Copy link
Member

@pdurbin pdurbin left a comment

Choose a reason for hiding this comment

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

I didn't test this but it looks good to me. Assuming it works, it probably makes sense to get this in Dataverse 5 since the biggest change is the move to Payara.


if [ ! -e dv/deps/payara-5.2020.2.zip ]; then
echo "payara dependency prep"
# no more fiddly patching :)
Copy link
Member

Choose a reason for hiding this comment

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

Hooray! 🎉

# yeah - still not happy if glassfish isn't in /usr/local :<
RUN ln -s /opt/glassfish4 /usr/local/glassfish4
# keeping the symlink on the off chance that something else is still assuming /usr/local/glassfish4
RUN ln -s /opt/payara5 /usr/local/glassfish4
Copy link
Member

Choose a reason for hiding this comment

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

I assume it's safe to not create this symlink. But it doesn't hurt to leave it in. I'm glad the comment was updated to described what's going on.

IQSS/dataverse (TO BE RETIRED / DELETED in favor of project 34) automation moved this from Code Review 🦁 to QA 🔎✅ Jul 22, 2020
@coveralls
Copy link

coveralls commented Jul 22, 2020

Coverage Status

Coverage decreased (-0.06%) to 19.544% when pulling 5a77f49 on 7112-payara5_aio into a6f580f on develop.

@pameyer pameyer moved this from QA 🔎✅ to Community Dev 💻❤️ in IQSS/dataverse (TO BE RETIRED / DELETED in favor of project 34) Jul 24, 2020
@pameyer pameyer self-assigned this Jul 24, 2020
@pameyer
Copy link
Contributor Author

pameyer commented Jul 24, 2020

Found that this does not work on a fresh system due to absence of glassfish-setup.sh ; was accidentally working on a dev system that still had a cached copy.

@pdurbin
Copy link
Member

pdurbin commented Jul 27, 2020

absence of glassfish-setup.sh

It's still there but it was renamed to as-setup.sh.

donsizemore pushed a commit to uncch-rdmc/dataverse that referenced this pull request Jul 29, 2020
@pameyer
Copy link
Contributor Author

pameyer commented Aug 3, 2020

updated and re-tested

@pameyer pameyer moved this from Community Dev 💻❤️ to Code Review 🦁 in IQSS/dataverse (TO BE RETIRED / DELETED in favor of project 34) Aug 3, 2020
@pdurbin
Copy link
Member

pdurbin commented Aug 3, 2020

I'm on 6a23496 and I'm getting ./install: line 22: ./glassfish-setup.sh: No such file or directory

@pameyer I'm wondering if you have an unpushed commit?

(Also, now you're making me refresh myself on how to stop and delete Docker containers. 😄 )

@pameyer
Copy link
Contributor Author

pameyer commented Aug 3, 2020

@pdurbin sorry about that - thanks for catching it!

Copy link
Member

@pdurbin pdurbin left a comment

Choose a reason for hiding this comment

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

Looking good. I see Payara, as expected:

$ curl -i http://localhost:8083/api/info/version
HTTP/1.1 200 OK
Server: Payara Server  5.2020.2 #badassfish
X-Powered-By: Servlet/4.0 JSP/2.3 (Payara Server  5.2020.2 #badassfish Java/Oracle Corporation/1.8)
Access-Control-Allow-Origin: *
Access-Control-Allow-Methods: PUT, GET, POST, DELETE, OPTIONS
Access-Control-Allow-Headers: Content-Type, X-Dataverse-Key
Content-Type: application/json;charset=UTF-8
Content-Length: 78
X-Frame-Options: SAMEORIGIN

{"status":"OK","data":{"version":"4.20","build":"7112-payara5_aio-5a77f49f7"}}

IQSS/dataverse (TO BE RETIRED / DELETED in favor of project 34) automation moved this from Code Review 🦁 to QA 🔎✅ Aug 3, 2020
@kcondon kcondon self-assigned this Aug 4, 2020
@kcondon kcondon merged commit c6e1406 into develop Aug 4, 2020
IQSS/dataverse (TO BE RETIRED / DELETED in favor of project 34) automation moved this from QA 🔎✅ to Done 🚀 Aug 4, 2020
@kcondon kcondon deleted the 7112-payara5_aio branch August 4, 2020 13:53
@djbrooke djbrooke added this to the Dataverse 5 milestone Aug 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

switch docker-aio to payara5
5 participants