Tests that are using connection to broker internally are excluded from

integration tests. Broker for docker is returned back to way it was before change, using broker.ip as broker and not localhost. Signed-off-by: Uros Mesaric Kunst <uros.mesaric-kunst@comtrade.com>
eclipse-kapua · Dec 10, 2018 · 7fe81a1 · 7fe81a1
1 parent 7c6aa73
commit 7fe81a1
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 7 deletions.
diff --git a/assembly/broker/docker/Dockerfile b/assembly/broker/docker/Dockerfile
@@ -39,7 +39,7 @@ ENV ACTIVEMQ_OPTS "-Dcommons.db.schema.update=true \
                    -Dcommons.eventbus.url=\${SERVICE_BROKER_ADDR} \
                    -Dcertificate.jwt.private.key=file:///var/opt/activemq/key.pk8 \
                    -Dcertificate.jwt.certificate=file:///var/opt/activemq/cert.pem \
-                   -Dbroker.ip=localhost"
+                   -Dbroker.ip=broker"
 
 EXPOSE 1883 8883 61614 61615 8161
 

diff --git a/qa/src/test/resources/features/broker/DeviceBrokerI9n.feature b/qa/src/test/resources/features/broker/DeviceBrokerI9n.feature
@@ -10,7 +10,6 @@
 #     Eurotech - initial API and implementation
 ###############################################################################
 @broker
-@integration
 Feature: Device Broker Integration
   Device Service integration scenarios with running broker service.
   Each Scenario starts with BIRTH of device and then the communication over MQTT

diff --git a/qa/src/test/resources/features/broker/DeviceBrokerIpConfigFileI9n.feature b/qa/src/test/resources/features/broker/DeviceBrokerIpConfigFileI9n.feature
@@ -10,7 +10,6 @@
 #     Eurotech - initial API and implementation
 ###############################################################################
 @broker
-@integration
 Feature: Device Broker connection ip with config file
   Device Service integration scenarios with running broker service.
 

diff --git a/qa/src/test/resources/features/broker/DeviceBrokerIpSysEnvI9n.feature b/qa/src/test/resources/features/broker/DeviceBrokerIpSysEnvI9n.feature
@@ -10,7 +10,6 @@
 #     Eurotech - initial API and implementation
 ###############################################################################
 @broker
-@integration
 Feature: Device Broker connection ip with System environment variable
   Device Service integration scenarios with running broker service.
 

diff --git a/qa/src/test/resources/features/broker/DeviceBrokerIpUndefinedI9n.feature b/qa/src/test/resources/features/broker/DeviceBrokerIpUndefinedI9n.feature
@@ -10,7 +10,6 @@
 #     Eurotech - initial API and implementation
 ###############################################################################
 @broker
-@integration
 Feature: Device Broker connection ip not set
   Device Service integration scenarios with running broker service.
 

diff --git a/qa/src/test/resources/features/broker/DeviceData.feature b/qa/src/test/resources/features/broker/DeviceData.feature
@@ -10,7 +10,6 @@
 #     Eurotech - initial API and implementation
 ###############################################################################
 @device
-@integration
 Feature: Device data scenarios
 
   Scenario: Set environment variables

diff --git a/qa/src/test/resources/features/broker/DeviceLifecycle.feature b/qa/src/test/resources/features/broker/DeviceLifecycle.feature
@@ -10,7 +10,6 @@
 #     Eurotech - initial API and implementation
 ###############################################################################
 @device
-@integration
 Feature: Device lifecycle scenarios
 
   Scenario: Set environment variables