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
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bcbf098
[issues-1315] - Fix RequestSpecBuilderResourceProvider in order to ta…
fabiobrz Sep 24, 2024
9fc8bc6
[issues-1315] - Fix functional tests in order to replace the no longe…
fabiobrz Sep 24, 2024
ebf8eb5
[issues-1315] - Bump docker-java and jboss-parent versions
fabiobrz Oct 5, 2024
d0115e9
[issues-1315] - Remove redundant docker-java dependency version from …
fabiobrz Oct 5, 2024
4a193cb
[issues-1315] - Adding required dependencies to docker/docker/pom.xml…
fabiobrz Oct 5, 2024
180ce46
[issues-1315] - Fixing how the docker-compose.yml config file path is…
fabiobrz Oct 5, 2024
96d12d9
[issues-1315] - Bumping Tomcat image tag used in Docker related tests…
fabiobrz Oct 5, 2024
a926161
[issues-1315] - Switch from javax.* to jakarta.* in Fabric8 maven plu…
fabiobrz Oct 5, 2024
d7c6cbf
[issues-1315] - Bumping Tomcat image tag used in ftest-docker-compose…
fabiobrz Oct 5, 2024
dc2ff72
[issues-1315] - Update the dependency for the JSch (Java SSH API) in …
fabiobrz Oct 5, 2024
a56d688
[issues-1315] - Use a different image for the FTP server in ftest-doc…
fabiobrz Oct 5, 2024
a9179de
[issues-1315] - Replace the no longer available jonmorehouse/ping-pon…
fabiobrz Oct 5, 2024
2e618d8
[issues-1315] - Bumping the WildFly image tag used in ftest-container…
fabiobrz Oct 5, 2024
1b6f30b
[issues-1315] - Replacing the git origin for ftest-docker-compose-v2-…
fabiobrz Oct 5, 2024
587e73e
[issues-1315] - Replace the no longer available jonmorehouse/ping-pon…
fabiobrz Oct 5, 2024
5e6019d
[issues-1315] - CI, enabling Docker integration tests
fabiobrz Oct 5, 2024
fe8fd7b
[issues-1315] - Updating the used h2 image in docker/ftest, docker/ft…
fabiobrz Oct 6, 2024
ee6d830
[issues-1315] - Bumping the docker server API version to 1.43 the lat…
fabiobrz Oct 6, 2024
49e0377
[issues-1315] - Replacing port 5000 with 5432 for docker/ftest-docker…
fabiobrz Oct 6, 2024
2c73b86
[issues-1315] - Fixing more outdated WildFly images in tests and docs
fabiobrz Oct 7, 2024
0886768
[issues-1315] - Fixing more dependencies configuration
fabiobrz Oct 13, 2024
2778630
[issues-1315] - Fixing the GitHub workflow CI script in order to use …
fabiobrz Oct 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Build and run integration tests for Docker target (${{ matrix.java }})
if: ${{ matrix.target == 'docker' }}
run: |
./mvnw package -Dfailsafe.groups=org.arquillian.cube.docker.impl.requirement.RequiresDocker -Dcontainerless.skip.tests=true
./mvnw verify -Dfailsafe.groups=org.arquillian.cube.docker.impl.requirement.RequiresDocker -Dcontainerless.skip.tests=true
- name: Build and run integration tests for Kubernetes target (${{ matrix.java }})
if: ${{ matrix.target == 'kubernetes' }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion containerless/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<tests.exp.undertow>**/*Daytime*</tests.exp.undertow>
<tests.container.node>node</tests.container.node>
<tests.container.undertow>daytime</tests.container.undertow>
<docker.api.version>1.30</docker.api.version>
<docker.api.version>1.43</docker.api.version>
<docker.api.url>tcp://localhost:2375</docker.api.url>
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
public class ContainerConfigurationControllerTest extends AbstractManagerTestBase {

public static final String CUBE_ID = "test";
private static final String CONTENT = "" + "image: tutum/tomcat:7.0\n" + "exposedPorts: [8089/tcp]\n"
private static final String CONTENT = "" + "image: tomcat:10.1.30\n" + "exposedPorts: [8089/tcp]\n"
+ "portBindings: [8090->8089/tcp]";

@Mock
Expand Down
1 change: 0 additions & 1 deletion docker/assertj/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>${version.docker-java}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
19 changes: 19 additions & 0 deletions docker/docker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,28 @@
<relativePath>../pom.xml</relativePath>
</parent>
<name>Arquillian Cube Docker</name>
<properties>
<version.javax.ws.rs-api>2.1.1</version.javax.ws.rs-api>
<version.javax.annotation-api>1.3.2</version.javax.annotation-api>
</properties>
<artifactId>arquillian-cube-docker</artifactId>

<dependencies>
<!--
TODO: Needed because arquillian-core and docker-java still need javax.* classes.
To be removed once arquillian-core version is bumped version is bumped, docker-java to be evaluated
-->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${version.javax.ws.rs-api}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${version.javax.annotation-api}</version>
</dependency>

<dependency>
<groupId>org.arquillian.cube</groupId>
<artifactId>arquillian-cube-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static DockerCompositions convert(DefinitionFormat definitionFormat, URI.

private static DockerCompositions convert(URI uri, DefinitionFormat definitionFormat) throws IOException {
try {
Path definitionFilePath = Paths.get(uri);
Path definitionFilePath = uri.getScheme() == null ? Paths.get(uri.toString()).toAbsolutePath() : Paths.get(uri);
return convert(definitionFilePath, definitionFormat);
} catch (FileSystemNotFoundException e) {
String content = "";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
org.arquillian.cube.docker.impl.requirement.DockerMachineRequirement
org.arquillian.cube.docker.impl.requirement.DockerRequirement
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class AwaitStrategyTest {
@Test
public void should_be_able_to_create_http_await_strategy() {
String containerDefinition = "tomcat:\n" +
" image: tutum/tomcat:7.0\n" +
" image: tomcat:10.1.30\n" +
" exposedPorts: [8089/tcp]\n" +
" await:\n" +
" strategy: http\n" +
Expand Down Expand Up @@ -316,7 +316,7 @@ public void should_create_log_scanning_await_strategy_without_defaults() {
@Test
public void should_parse_command() {
String containerDefinition = "tomcat:\n"
+ " image: tutum/tomcat:7.0\n"
+ " image: tomcat:10.1.30\n"
+ " exposedPorts: [8089/tcp]\n"
+ " await:\n"
+ " strategy: docker_health\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ public class AfterStartContainerObserverTest extends AbstractManagerTestBase {

private static final String CONTAINER_COPY_CONFIGURATION =
"tomcat_default:\n" +
" image: tutum/tomcat:7.0\n" +
" image: tomcat:10.1.30\n" +
" afterStart:\n" +
" - copy:\n" +
" to: /test\n" +
" from: ";

private static final String CONTAINER_CUSTOM_AFTER_START_ACTION_CONFIGURATION =
"tomcat_default:\n" +
" image: tutum/tomcat:7.0\n" +
" image: tomcat:10.1.30\n" +
" afterStart:\n" +
" - customAfterStartAction:\n" +
" strategy: org.arquillian.cube.docker.impl.afterStart.CustomAfterStartActionImpl";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ public class AfterStopContainerObserverTest extends AbstractManagerTestBase {

private static final String CONTAINER_COPY_CONFIGURATION =
"tomcat_default:\n" +
" image: tutum/tomcat:7.0\n" +
" image: tomcat:10.1.30\n" +
" afterStop:\n" +
" - copy:\n" +
" from: /test\n" +
" to: ";

private static final String CONTAINER_LOG_CONFIGURATION =
"tomcat_default:\n" +
" image: tutum/tomcat:7.0\n" +
" image: tomcat:10.1.30\n" +
" afterStop:\n" +
" - log:\n" +
" to: ";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void shouldStartNoneDeployableContainersWithRegisteredNetwork() {
+
"tomcat:\n"
+
" image: tutum/tomcat:7.0\n"
" image: tomcat:10.1.30\n"
+
" exposedPorts: [8089/tcp]\n"
+
Expand All @@ -40,7 +40,7 @@ public void shouldStartNoneDeployableContainersWithRegisteredNetwork() {
+
"pingpong:\n"
+
" image: jonmorehouse/ping-pong\n"
" image: tsongpon/pingpong\n"
+
" exposedPorts: [8080/tcp]\n"
+
Expand Down Expand Up @@ -68,7 +68,7 @@ public void shouldNotStartManualContainers() {
String config =
"tomcat:\n"
+
" image: tutum/tomcat:7.0\n"
" image: tomcat:10.1.30\n"
+
" exposedPorts: [8089/tcp]\n"
+
Expand All @@ -78,7 +78,7 @@ public void shouldNotStartManualContainers() {
+
"pingpong:\n"
+
" image: jonmorehouse/ping-pong\n"
" image: tsongpon/pingpong\n"
+
" exposedPorts: [8080/tcp]\n"
+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ public class BeforeStopContainerObserverTest extends AbstractManagerTestBase {

private static final String CONTAINER_COPY_CONFIGURATION =
"tomcat_default:\n" +
" image: tutum/tomcat:7.0\n" +
" image: tomcat:10.1.30\n" +
" beforeStop:\n" +
" - copy:\n" +
" from: /test\n" +
" to: ";

private static final String CONTAINER_LOG_CONFIGURATION =
"tomcat_default:\n" +
" image: tutum/tomcat:7.0\n" +
" image: tomcat:10.1.30\n" +
" beforeStop:\n" +
" - log:\n" +
" to: ";

private static final String CONTAINER_CUSTOM_BEFORE_STOP_ACTION_CONFIGURATION =
"tomcat_default:\n" +
" image: tutum/tomcat:7.0\n" +
" image: tomcat:10.1.30\n" +
" beforeStop:\n" +
" - customBeforeStopAction:\n" +
" strategy: org.arquillian.cube.docker.impl.beforeStop.CustomBeforeStopActionImpl";
Expand Down
Loading
Loading