made azure management service part of the core composition setup

Changelog: None Signed-off-by: Manuel Zedel <[email protected]>
jamtools · Oct 22, 2021 · a063baa · a063baa
1 parent 5e5ae21
commit a063baa
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 24 deletions.
diff --git a/backend-tests/run b/backend-tests/run
@@ -12,7 +12,6 @@ COMPOSE_CMD_BASE="docker-compose -p backend-tests \
 COMPOSE_CMD_OPEN="docker-compose -p backend-tests \
         -f $INTEGRATION_PATH/docker-compose.yml \
         -f $INTEGRATION_PATH/docker-compose.demo.yml \
-        -f $INTEGRATION_PATH/docker-compose.azure.yml \
         -f $INTEGRATION_PATH/docker-compose.connect.yml \
         -f $INTEGRATION_PATH/docker-compose.config.yml \
         -f $INTEGRATION_PATH/docker-compose.storage.minio.yml

diff --git a/demo b/demo
@@ -9,7 +9,7 @@ DOCKER_COMPOSE_PROJECT_NAME=${DOCKER_COMPOSE_PROJECT_NAME:-$(tr -d ".-" <<<${PWD
 
 EXTRA_FILES=""
 
-DEMO_FILES="-f docker-compose.yml -f docker-compose.azure.yml -f docker-compose.config.yml -f docker-compose.connect.yml -f docker-compose.storage.minio.yml -f docker-compose.demo.yml"
+DEMO_FILES="-f docker-compose.yml -f docker-compose.config.yml -f docker-compose.connect.yml -f docker-compose.storage.minio.yml -f docker-compose.demo.yml"
 CLIENT_FILES="-f docker-compose.client.yml -f docker-compose.client.demo.yml"
 ENTERPRISE_FILES="-f docker-compose.enterprise.yml -f docker-compose.monitor.yml -f docker-compose.auditlogs.yml -f docker-compose.auditlogs.connect.yml -f docker-compose.auditlogs.config.yml"
 ENTERPRISE_CLIENT_FILES="-f docker-compose.monitor-client.commercial.yml -f docker-compose.client.demo.yml"

diff --git a/docker-compose.azure.yml b/docker-compose.azure.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,21 @@
 version: '2.1'
 services:
 
+    #
+    # mender-azure-iot-manager
+    #
+    mender-azure-iot-manager:
+        image: mendersoftware/azure-iot-manager:mender-master
+        extends:
+            file: common.yml
+            service: mender-base
+        networks:
+            - mender
+        depends_on:
+            - mender-mongo
+        labels:
+            mender.healthcheck.path: "/api/internal/v1/azure-iot-manager/health"
+
     #
     # mender-deployments
     #

diff --git a/extra/release_tool.py b/extra/release_tool.py
@@ -436,7 +436,6 @@ def filter_docker_compose_files_list(list, version):
     _DOCKER_ONLY_YML = [
         "docker-compose.yml",
         "docker-compose.enterprise.yml",
-        "docker-compose.azure.yml",
         "docker-compose.auditlogs.yml",
         "docker-compose.connect.yml",
         "docker-compose.config.yml",

diff --git a/extra/travis-testing/run-test-environment b/extra/travis-testing/run-test-environment
@@ -56,7 +56,7 @@ shift
 
 
 [ "$TEST_TYPE" == "acceptance" ] && {
-    COMPOSE_CMD="docker-compose -p acceptance-tests -f $INTEGRATION_PATH/docker-compose.yml -f $INTEGRATION_PATH/docker-compose.storage.minio.yml -f $INTEGRATION_PATH/docker-compose.demo.yml -f $INTEGRATION_PATH/docker-compose.azure.yml"
+    COMPOSE_CMD="docker-compose -p acceptance-tests -f $INTEGRATION_PATH/docker-compose.yml -f $INTEGRATION_PATH/docker-compose.storage.minio.yml -f $INTEGRATION_PATH/docker-compose.demo.yml"
     TEST_SERVICE=${TEST_SERVICE:-"acceptance"}
     # technically we could use 'docker-compose run' here, but it doesn't preserve the acceptance service name,
     # which is needed e.g. for predictably running the tenantadm mock

diff --git a/production/run b/production/run
@@ -28,7 +28,6 @@ exec docker-compose \
      -p menderproduction \
      -f ../docker-compose.yml \
      -f ../docker-compose.storage.minio.yml \
-     -f ../docker-compose.azure.yml \
      -f ../docker-compose.connect.yml \
      -f ../docker-compose.config.yml \
      $ENTERPRISE_DOCKER_COMPOSE \

diff --git a/testutils/infra/container_manager/docker_compose_manager.py b/testutils/infra/container_manager/docker_compose_manager.py
@@ -27,7 +27,6 @@ class DockerComposeNamespace(DockerComposeBaseNamespace):
     BASE_FILES = [
         COMPOSE_FILES_PATH + "/docker-compose.yml",
         COMPOSE_FILES_PATH + "/docker-compose.storage.minio.yml",
-        COMPOSE_FILES_PATH + "/docker-compose.azure.yml",
         COMPOSE_FILES_PATH + "/docker-compose.config.yml",
         COMPOSE_FILES_PATH + "/docker-compose.connect.yml",
         COMPOSE_FILES_PATH + "/docker-compose.testing.yml",