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

Resume Docker integrations tests #1317

Merged
merged 22 commits into from
Oct 14, 2024

Conversation

fabiobrz
Copy link
Collaborator

@fabiobrz fabiobrz commented Oct 5, 2024

The changes here aim at fixing the Docker integration tests after the recent updates, and to enable GitHub workflow based CI checks

Short description of what this resolves:

Fixing implementation after changes to support JDK 11, resuming Docker integration tests, upgrading dependencies where required, enabling proper CI check via GitHub workflow
The CI checks which are executed with the changes in this PR will actually execute Docker integration tests.

Changes proposed in this pull request:

  • Some fixes to the functional classes, mainly due to previous updates, e.g.: adding support for JDK11
  • Version bump, both at POM dependencies level (e.g.: JBoss parent, docker-java, etc.), and images version used in functional tests (e.g.: WildFly image), which in turn implies some changes to the test deployments, most notably moving from javax.* to jakarta.*
  • Bumping the Docker server API versionused by Docker integration tests and containerless to 1.43, which is the latest supported by docker-java 3.4.0
  • Replacement of no longer available images used in Docker integration tests, e.g.: jonmorehouse/ping-pong is replaced by hashicorp/http-echo:alpine - thanks to the work done by @gaol in [issue:1303] Drop usage of unavailable docker image out of tests #1306 here - and by tsongpon/pingpong, depending on the related configuration requirements
  • Bumping Tomcat dependencies in Docker integration tests, from 7 to 10. Changes to the server image definition (e.g.: exposing the manager ap which is needed to deploy), and to the related test deployments, most notably moving from javax.* to jakarta.* have been introduced accordingly
  • Docker container object related integration tests using FTP and SSH containers, have been updated to replace no longer available images, or to update required dependencies
  • The H2 database image used by Docker integration tests has been replaced as well by a more recent one
  • Resuming the Docker integration tests execution in the GitHub workflow based CI script, and fix some tests which were expecting to use ports which might not be available in the CI environment (e.g.: 5000 for minkube, or 8089 for splunk)

Follow up issues
The following is a list of issues that have been logged as a follow up to the actions described above:

Fixes #1315, resolves #1302

…ke the desired request base path into account
…r existing jonmorehouse/ping-pong Docker image
… computed, since java.nio.Paths in JDK 11 does not allow for URI with null schema
… from 7 to 10, from 6 to 9 where a previous version is used

In docker functional tests: switch from javax.* to jakarta.* in deployments, in order to let containers provide depoyments which byteconde is compatible with JDK 11
…-v2 tests, switch from javax.* to jakarta.* in deployments, in order to let containers provide depoyments which byteconde is compatible with JDK 11, make the Tomcat manager app available in deployments, and relax the Tomcat 10 context.xml file requirements to allow connections routed from the container host IP address
…order to use the well maintained fork om.github.mwiede/jsch, which allows for more recently generated private keys
…ker-containerobject, and updating tests and resources accordingly, since dipakpawar231/proftpd:v1 is no longer available
…-star-operator tests, switch from javax.* to jakarta.* in deployments, in order to let containers provide depoyments which byteconde is compatible with JDK 11
@fabiobrz fabiobrz force-pushed the issues-1315.resume-docker-it branch 2 times, most recently from 6c9d2e4 to ba3a889 Compare October 6, 2024 21:01
…g image with the tsongpon/pingpong image, where hashicorp/http-echo is tricky to configure due to commands, envs and docker compose combination
…est-standalone and docker/ftest-junit-rules. Also - in docker/ftest - bumping the WildFly version, and adding relaxed context.xml for Tomacat 10 to allow external connections, plus enabling the manager app
…-containerobject tests, since 5000 is already in use by GitHub runners that execute CI checks
@fabiobrz fabiobrz force-pushed the issues-1315.resume-docker-it branch from ba3a889 to 49e0377 Compare October 6, 2024 21:21
Copy link
Collaborator

@gaol gaol left a comment

Choose a reason for hiding this comment

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

Overall it looks great unless some of my overcritical comments 👍 :)

docker/ftest-docker-compose-v2/pom.xml Outdated Show resolved Hide resolved
docker/ftest-junit-rules/src/test/resources/arquillian.xml Outdated Show resolved Hide resolved
docker/ftest-standalone/src/test/resources/arquillian.xml Outdated Show resolved Hide resolved
docker/ftest-standalone/pom.xml Show resolved Hide resolved
docker/ftest/src/test/resources/arquillian.xml Outdated Show resolved Hide resolved
docker/ftest/src/test/resources/test-persistence.xml Outdated Show resolved Hide resolved
@fabiobrz fabiobrz force-pushed the issues-1315.resume-docker-it branch from 1f33f18 to 283f322 Compare October 13, 2024 08:39
…a more recent version for the setup-minikube step
@fabiobrz fabiobrz force-pushed the issues-1315.resume-docker-it branch from 283f322 to 2778630 Compare October 13, 2024 08:54
@fabiobrz fabiobrz requested a review from gaol October 13, 2024 09:05
@fabiobrz
Copy link
Collaborator Author

Overall it looks great unless some of my overcritical comments 👍 :)

Thanks for your review @gaol - actually pretty good points, so I've fixed the changes accordingly.

Copy link
Collaborator

@gaol gaol left a comment

Choose a reason for hiding this comment

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

LGTM !

@jimma
Copy link
Collaborator

jimma commented Oct 14, 2024

This looks good to me . Nice work @fabiobrz !

@gaol gaol merged commit 525d835 into arquillian:main Oct 14, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants