From 5a13c84d0a9747f6868ebc3c8b6e73cb78c486d9 Mon Sep 17 00:00:00 2001
From: Manuel Zedel <manuel.zedel@northern.tech>
Date: Thu, 12 Sep 2024 12:15:49 +0200
Subject: [PATCH] ci: allowed overriding gui test images

Ticket: None
Changelog: None
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>
---
 frontend/pipeline.yml                         |  1 +
 .../docker-compose.e2e-tests.enterprise.yml   | 20 +++++++++----------
 .../e2e_tests/docker-compose.e2e-tests.yml    | 20 +++++++++----------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/frontend/pipeline.yml b/frontend/pipeline.yml
index 0c2578c8..634c9609 100644
--- a/frontend/pipeline.yml
+++ b/frontend/pipeline.yml
@@ -167,6 +167,7 @@ build:frontend:docker:
     - apk add --no-cache bash git jq wget
     - docker pull ${CI_REGISTRY_IMAGE}:frontend-${CI_PIPELINE_ID}
     - docker tag ${CI_REGISTRY_IMAGE}:frontend-${CI_PIPELINE_ID} ${FRONTEND_REPOSITORY}:pr
+    - export MENDER_IMAGE_TAG=${CI_COMMIT_TAG:-main}
   artifacts:
     expire_in: 2w
     paths:
diff --git a/frontend/tests/e2e_tests/docker-compose.e2e-tests.enterprise.yml b/frontend/tests/e2e_tests/docker-compose.e2e-tests.enterprise.yml
index 1a608f63..e34889e6 100644
--- a/frontend/tests/e2e_tests/docker-compose.e2e-tests.enterprise.yml
+++ b/frontend/tests/e2e_tests/docker-compose.e2e-tests.enterprise.yml
@@ -20,24 +20,24 @@ services:
       - traefik
 
   auditlogs:
-    image: mendersoftware/auditlogs:main
+    image: mendersoftware/auditlogs:${MENDER_IMAGE_TAG:-main}
   deployments:
-    image: mendersoftware/deployments-enterprise:main
+    image: mendersoftware/deployments-enterprise:${MENDER_IMAGE_TAG:-main}
   deviceauth:
-    image: mendersoftware/deviceauth-enterprise:main
+    image: mendersoftware/deviceauth-enterprise:${MENDER_IMAGE_TAG:-main}
   devicemonitor:
-    image: registry.mender.io/mendersoftware/devicemonitor:main
+    image: registry.mender.io/mendersoftware/devicemonitor:${MENDER_IMAGE_TAG:-main}
   generate-delta-worker:
-    image: registry.mender.io/mendersoftware/generate-delta-worker:main
+    image: registry.mender.io/mendersoftware/generate-delta-worker:${MENDER_IMAGE_TAG:-main}
   inventory:
-    image: mendersoftware/inventory-enterprise:main
+    image: mendersoftware/inventory-enterprise:${MENDER_IMAGE_TAG:-main}
   tenantadm:
-    image: mendersoftware/tenantadm:main
+    image: mendersoftware/tenantadm:${MENDER_IMAGE_TAG:-main}
   useradm:
-    image: mendersoftware/useradm-enterprise:main
+    image: mendersoftware/useradm-enterprise:${MENDER_IMAGE_TAG:-main}
     environment:
       USERADM_BASE_URL: "https://docker.mender.io"
   workflows:
-    image: mendersoftware/workflows-enterprise:main
+    image: mendersoftware/workflows-enterprise:${MENDER_IMAGE_TAG:-main}
   workflows-worker:
-    image: mendersoftware/workflows-enterprise-worker:main
+    image: mendersoftware/workflows-enterprise-worker:${MENDER_IMAGE_TAG:-main}
diff --git a/frontend/tests/e2e_tests/docker-compose.e2e-tests.yml b/frontend/tests/e2e_tests/docker-compose.e2e-tests.yml
index d092a037..904fb7bf 100644
--- a/frontend/tests/e2e_tests/docker-compose.e2e-tests.yml
+++ b/frontend/tests/e2e_tests/docker-compose.e2e-tests.yml
@@ -43,27 +43,27 @@ services:
       - ${GUI_REPOSITORY}/tests/e2e_tests/dockerClient/mender-connect.json:/etc/mender/mender-connect.conf
 
   create-artifact-worker:
-    image: mendersoftware/create-artifact-worker:main
+    image: mendersoftware/create-artifact-worker:${MENDER_IMAGE_TAG:-main}
   deployments:
-    image: mendersoftware/deployments:main
+    image: mendersoftware/deployments:${MENDER_IMAGE_TAG:-main}
     environment:
       DEPLOYMENTS_AWS_EXTERNAL_URI: "https://s3.docker.mender.io"
   deviceauth:
-    image: mendersoftware/deviceauth:main
+    image: mendersoftware/deviceauth:${MENDER_IMAGE_TAG:-main}
   deviceconfig:
-    image: mendersoftware/deviceconfig:main
+    image: mendersoftware/deviceconfig:${MENDER_IMAGE_TAG:-main}
   deviceconnect:
-    image: mendersoftware/deviceconnect:main
+    image: mendersoftware/deviceconnect:${MENDER_IMAGE_TAG:-main}
   inventory:
-    image: mendersoftware/inventory:main
+    image: mendersoftware/inventory:${MENDER_IMAGE_TAG:-main}
   iot-manager:
-    image: mendersoftware/iot-manager:main
+    image: mendersoftware/iot-manager:${MENDER_IMAGE_TAG:-main}
   useradm:
-    image: mendersoftware/useradm:main
+    image: mendersoftware/useradm:${MENDER_IMAGE_TAG:-main}
   workflows:
-    image: mendersoftware/workflows:main
+    image: mendersoftware/workflows:${MENDER_IMAGE_TAG:-main}
   workflows-worker:
-    image: mendersoftware/workflows:main
+    image: mendersoftware/workflows:${MENDER_IMAGE_TAG:-main}
 
   traefik:
     volumes: