diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b820dee9..c6981674 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: cd UmatiDashboardOpcUaClient/Tests/integration/cacert_test || exit ./genCerts.sh cp "${{ github.workspace }}/build/Dashboard-Client-build/Tests/unit/TestCaCertificate" . - docker-compose up -d + docker compose up -d ./evaluateTest.sh - name: Upload Artefacts uses: actions/upload-artifact@v4 diff --git a/README.md b/README.md index c12dc213..a0e62c6a 100644 --- a/README.md +++ b/README.md @@ -58,11 +58,11 @@ You can use the client for instance testing or for connecting to the umati.app D Follow these instructions to use the client as a testing tool for your implementation: [Model Testing usage](doc/usage_as_model_test.md) - **Local requirements** +#### Local requirements For the local instance testing you need to run your own MQTT Broker and a MQTT Client. See [MQTT Doc](doc/MQTT.md) for more information and instructions -[Here](example/ShowcaseDeployment/) is an docker-compose example including a mqtt broker, a umati Sample Server and the gateway. The example contains also the need configuration for the samples. +[Here](example/ShowcaseDeployment/) is an `docker compose` example including a mqtt broker, a umati Sample Server and the gateway. The example contains also the need configuration for the samples. ### Usage for connecting a server to the dashboard diff --git a/Tests/integration/cacert_test/docker-compose.yml b/Tests/integration/cacert_test/docker-compose.yml index b10e9eb0..2bec41ba 100644 --- a/Tests/integration/cacert_test/docker-compose.yml +++ b/Tests/integration/cacert_test/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.1' services: mqtt: image: eclipse-mosquitto diff --git a/Tests/integration/cacert_test/evaluateTest.sh b/Tests/integration/cacert_test/evaluateTest.sh index b1828dff..f83d68e5 100755 --- a/Tests/integration/cacert_test/evaluateTest.sh +++ b/Tests/integration/cacert_test/evaluateTest.sh @@ -1,11 +1,11 @@ #!/bin/bash NEXT_WAITTIME=0 WAITTIME_LIMIT_SEC=120 -while [[ "$(docker inspect cacert_test_test_1 --format='{{.State.Status}}')" != "exited" || "$NEXT_WAITTIME" == "$WAITTIME_LIMIT_SEC" ]] +while [[ "$(docker inspect cacert_test-test-1 --format='{{.State.Status}}')" != "exited" || "$NEXT_WAITTIME" == "$WAITTIME_LIMIT_SEC" ]] do echo "Waiting for test container to become ready since ${NEXT_WAITTIME}s..." sleep 1 - NEXT_WAITTIME=$(($NEXT_WAITTIME+1)) + NEXT_WAITTIME=$((NEXT_WAITTIME+1)) done -docker-compose logs -exit "$(docker inspect cacert_test_test_1 --format='{{.State.ExitCode}}')" +docker compose logs +exit "$(docker inspect cacert_test-test-1 --format='{{.State.ExitCode}}')"