From 163f007bbb5887372389a2550575fb518d07df77 Mon Sep 17 00:00:00 2001 From: Saeed Rezaee Date: Mon, 15 Jan 2024 09:48:59 +0100 Subject: [PATCH] Update docker containers Signed-off-by: Saeed Rezaee --- docker/test/docker-compose.yml | 9 +++++---- .../ddiclient/integrationtest/SuccessfulForcedUpdate.kt | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/test/docker-compose.yml b/docker/test/docker-compose.yml index 313e4da..cbe8dec 100644 --- a/docker/test/docker-compose.yml +++ b/docker/test/docker-compose.yml @@ -1,9 +1,9 @@ -version: "3.4" +version: "3.7" services: update-server: - image: hawkbit/hawkbit-update-server:0.3.0M7-mysql + image: hawkbit/hawkbit-update-server:0.4.1-mysql environment: - JAVA_STD_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=n @@ -12,9 +12,10 @@ services: - JAVA_ADV_SERVICEABILITY_OPTIONS=-XX:+HeapDumpOnOutOfMemoryError - JAVA_ADV_GC_OPTIONS=-XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -XX:+UseG1GC -XX:+UseStringDeduplication - JAVA_ARGS=--spring.profiles.active=mockIam,withMariaDB + - SPRING_DATASOURCE_URL=jdbc:mariadb://maria-db:3306/hawkbit?useMysqlMetadata=true command: [ - "--spring.datasource.url=jdbc:mysql://maria-db:3306/hawkbit?useMysqlMetadata=true", + "--spring.datasource.url=jdbc:mariadb://maria-db:3306/hawkbit?useMysqlMetadata=true", "--spring.datasource.username=hawkbit", "--spring.datasource.password=1234", "--spring.security.user.name=test", @@ -43,7 +44,7 @@ services: # ------------------------------------------------ maria-db: - image: mariadb:10.3 + image: mariadb:10.6 networks: - hara-network environment: diff --git a/src/test/kotlin/org/eclipse/hara/ddiclient/integrationtest/SuccessfulForcedUpdate.kt b/src/test/kotlin/org/eclipse/hara/ddiclient/integrationtest/SuccessfulForcedUpdate.kt index 1097eea..988d065 100644 --- a/src/test/kotlin/org/eclipse/hara/ddiclient/integrationtest/SuccessfulForcedUpdate.kt +++ b/src/test/kotlin/org/eclipse/hara/ddiclient/integrationtest/SuccessfulForcedUpdate.kt @@ -63,13 +63,13 @@ class SuccessfulForcedUpdate : AbstractClientTest() { ActionStatus.ContentEntry( ActionStatus.ContentEntry.Type.canceled, listOf( - "Update Server: Cancelation confirmed.", + "Update Server: Cancellation confirmed.", "Update Server: Cancellation completion is finished sucessfully." ) ), ActionStatus.ContentEntry( ActionStatus.ContentEntry.Type.retrieved, - listOf("Update Server: Target retrieved cancel action and should start now the cancelation.") + listOf("Update Server: Target retrieved cancel action and should start now the cancellation.") ), ActionStatus.ContentEntry( ActionStatus.ContentEntry.Type.canceling,