edqs docker image renamed

docker/.env

@@ -14,7 +14,7 @@ COAP_TRANSPORT_DOCKER_NAME=tb-coap-transport
 LWM2M_TRANSPORT_DOCKER_NAME=tb-lwm2m-transport
 SNMP_TRANSPORT_DOCKER_NAME=tb-snmp-transport
 TB_VC_EXECUTOR_DOCKER_NAME=tb-vc-executor
-EDQS_DOCKER_NAME=edqs
+EDQS_DOCKER_NAME=tb-edqs
 
 TB_VERSION=latest
 

docker/docker-compose.edqs.yml

@@ -17,14 +17,14 @@
 version: '3.0'
 
 services:
-  edqs-1:
+  tb-edqs-1:
     restart: always
     image: "${DOCKER_REPO}/${EDQS_DOCKER_NAME}:${TB_VERSION}"
     env_file:
       - edqs.env
     depends_on:
       - zookeeper
-  edqs-2:
+  tb-edqs-2:
     restart: always
     image: "${DOCKER_REPO}/${EDQS_DOCKER_NAME}:${TB_VERSION}"
     env_file:

msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java

@@ -186,8 +186,8 @@ public class ContainerTestSuite {
                     .waitingFor("tb-vc-executor1", Wait.forLogMessage(TB_VC_LOG_REGEXP, 1).withStartupTimeout(CONTAINER_STARTUP_TIMEOUT))
                     .waitingFor("tb-vc-executor2", Wait.forLogMessage(TB_VC_LOG_REGEXP, 1).withStartupTimeout(CONTAINER_STARTUP_TIMEOUT))
                     .waitingFor("tb-js-executor", Wait.forLogMessage(TB_JS_EXECUTOR_LOG_REGEXP, 1).withStartupTimeout(CONTAINER_STARTUP_TIMEOUT))
-                    .waitingFor("edqs-1", Wait.forHttp("/api/edqs/ready").withStartupTimeout(CONTAINER_STARTUP_TIMEOUT))
-                    .waitingFor("edqs-2", Wait.forHttp("/api/edqs/ready").withStartupTimeout(CONTAINER_STARTUP_TIMEOUT));
+                    .waitingFor("tb-edqs-1", Wait.forHttp("/api/edqs/ready").withStartupTimeout(CONTAINER_STARTUP_TIMEOUT))
+                    .waitingFor("tb-edqs-2", Wait.forHttp("/api/edqs/ready").withStartupTimeout(CONTAINER_STARTUP_TIMEOUT));
             testContainer.start();
             setActive(true);
         } catch (Exception e) {

msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java

@@ -53,7 +53,6 @@ import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultCustom
 import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultDeviceProfile;
 import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultTenantAdmin;
 
-@DisableUIListeners
 public class EdqsEntityDataQueryTest extends AbstractContainerTest {
 
     private TenantId tenantId;

msa/edqs/pom.xml

@@ -35,7 +35,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.name>edqs</pkg.name>
-        <docker.name>edqs</docker.name>
+        <docker.name>tb-edqs</docker.name>
         <pkg.logFolder>/var/log/${pkg.name}</pkg.logFolder>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
         <docker.push-arm-amd-image.phase>pre-integration-test</docker.push-arm-amd-image.phase>