test: integration tests for docker-compose UM

.env

@@ -23,13 +23,17 @@ MENDER_MONITOR_QEMU_COMMERCIAL_TAG=mender-master
 MENDER_QEMU_ROFS_COMMERCIAL_IMAGE=mender-qemu-rofs-commercial
 MENDER_QEMU_ROFS_COMMERCIAL_TAG=mender-master
 
+MENDER_CLIENT_QEMU_EXTENDED_IMAGE=mender-client-qemu-extended
+MENDER_CLIENT_QEMU_EXTENDED_TAG=mender-master
+
 # Artifacts from mender-gateway
 MENDER_GATEWAY_IMAGE=mender-gateway
 MENDER_GATEWAY_REGISTRY=registry.mender.io
 MENDER_GATEWAY_REPOSITORY=mendersoftware
 MENDER_GATEWAY_TAG=master
 
 MENDER_ARTIFACT_VERSION=3.11.2
+MENDER_CONTAINER_MODULES_VERSION=main
 
 # If MENDER_LEGACY_IMAGE is defined, the image reference uses
 # the legacy format:

.gitlab-ci.yml

@@ -117,6 +117,13 @@ variables:
     description: "Mender QEMU commercial read-only filesystem image tag"
     value: $MENDER_VIRTUAL_DEVICE_TAG
 
+  MENDER_CLIENT_QEMU_EXTENDED_IMAGE:
+    description: "Mender Client QEMU image with virtualization/Docker support for running integration tests"
+    value: mender-client-qemu-extended
+  MENDER_CLIENT_QEMU_EXTENDED_TAG:
+    description: "Mender Client QEMU virtualization image tag"
+    value: $MENDER_VIRTUAL_DEVICE_TAG
+
   MENDER_ARTIFACT_VERSION:
     description: "mender-artifact tool version"
     value: 4.1.0

docker-compose.client.extended.yml

@@ -0,0 +1,20 @@
+services:
+  #
+  # mender-client
+  #
+  mender-client:
+    image: ${MENDER_CLIENT_REGISTRY}/${MENDER_CLIENT_REPOSITORY}/${MENDER_CLIENT_QEMU_EXTENDED_IMAGE}:${MENDER_CLIENT_QEMU_EXTENDED_TAG}
+    networks:
+      - mender
+    stdin_open: true
+    tty: true
+    privileged: true
+    environment:
+      SERVER_URL:
+      TENANT_TOKEN:
+      QEMU_MEMORY: 512M
+    blkio_config:
+      weight: 100
+
+networks:
+  mender: {}

tests/common_setup.py

@@ -44,6 +44,23 @@ def standard_setup_one_client(request):
     return env
 
 
+@pytest.fixture(scope="function")
+def standard_setup_extended(request):
+    env = container_factory.get_extended_setup(num_clients=1)
+    request.addfinalizer(env.teardown)
+
+    env.setup()
+
+    env.device = MenderDevice(env.get_mender_clients()[0])
+    env.device.ssh_is_opened()
+
+    reset_mender_api(env)
+    devauth.accept_devices(1)
+
+    env.auth = auth
+    return env
+
+
 @pytest.fixture(scope="function")
 def monitor_commercial_setup_no_client(request):
     env = container_factory.get_monitor_commercial_setup(num_clients=0)

tests/requirements-system/apk-requirements.txt

@@ -16,3 +16,4 @@ openssl
 py3-pip
 python3-dev
 zstd
+skopeo

tests/requirements-system/deb-requirements.txt

@@ -2,3 +2,4 @@ docker
 docker-compose
 python-pip
 python3-pip
+skopeo