Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions .github/actions/run-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inputs:
default: 'false'
databroker-version:
description: "Databroker Version"
default: 'main'
default: 'latest'
kotest-tag:
description: >
The Kotest Tag to use when executing the tests. Check Tag.kt for valid options. Different Tags might require the
Expand All @@ -23,10 +23,9 @@ runs:
- name: Run 'test' with Gradle Wrapper
run: ./gradlew test -Ddatabroker.tag="${{ inputs.databroker-version }}" -Dkotest.tags="${{ inputs['kotest-tag'] }}" -Ddatabroker.timeout=30
shell: bash
continue-on-error: true

- name: Upload Test Reports
if: ${{ inputs['upload-test-reports'] == 'true' }}
if: ${{ always() && inputs['upload-test-reports'] == 'true' }}
uses: actions/upload-artifact@v4
with:
name: test-reports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ package org.eclipse.kuksa.connectivity.databroker.docker
import com.github.dockerjava.api.DockerClient
import com.github.dockerjava.api.command.CreateContainerResponse
import com.github.dockerjava.api.command.PullImageResultCallback
import com.github.dockerjava.api.command.WaitContainerResultCallback
import com.github.dockerjava.api.exception.NotModifiedException
import com.github.dockerjava.api.model.AccessMode
import com.github.dockerjava.api.model.Bind
Expand Down Expand Up @@ -168,10 +167,6 @@ abstract class DataBrokerDockerContainer(
private fun startContainer(containerId: String) {
try {
dockerClient.startContainerCmd(containerId).exec()

dockerClient.waitContainerCmd(containerId)
.exec(WaitContainerResultCallback())
.awaitCompletion(timeout.toLong(), TimeUnit.SECONDS)
} catch (_: NotModifiedException) {
// thrown when a container is already started
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
package org.eclipse.kuksa.connectivity.databroker.docker

import com.github.dockerjava.api.command.CreateContainerResponse
import com.github.dockerjava.api.model.ExposedPort
import com.github.dockerjava.api.model.InternetProtocol

// no tls, no authentication
class InsecureDataBrokerDockerContainer(
Expand All @@ -31,7 +33,9 @@ class InsecureDataBrokerDockerContainer(
return dockerClient.createContainerCmd("$repository:$tag")
.withName("${containerName}_${System.nanoTime()}")
.withHostConfig(hostConfig)
.withExposedPorts(ExposedPort(port, InternetProtocol.TCP))
.withCmd(
"--address", "0.0.0.0",
"--port", "$port",
"--insecure",
"--vss", vssMount,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ package org.eclipse.kuksa.connectivity.databroker.docker
import com.github.dockerjava.api.command.CreateContainerResponse
import com.github.dockerjava.api.model.AccessMode
import com.github.dockerjava.api.model.Bind
import com.github.dockerjava.api.model.ExposedPort
import com.github.dockerjava.api.model.HostConfig
import com.github.dockerjava.api.model.InternetProtocol
import com.github.dockerjava.api.model.Volume
import org.eclipse.kuksa.test.TestResourceFile

Expand All @@ -49,7 +51,9 @@ class SecureDataBrokerDockerContainer(
return dockerClient.createContainerCmd("$repository:$tag")
.withName("${containerName}_${System.nanoTime()}")
.withHostConfig(hostConfig)
.withExposedPorts(ExposedPort(port, InternetProtocol.TCP))
.withCmd(
"--address", "0.0.0.0",
"--port", "$port",
"--tls-cert", "$tlsMount/Server.pem",
"--tls-private-key", "$tlsMount/Server.key",
Expand Down
Loading