From 44b11d54b1b5c806b2b499882099317c7b9e719a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 9 Mar 2021 15:44:10 -0500 Subject: [PATCH] ci: use GitLab services for AMQP and MQTT tests --- .gitlab-ci.yml | 3 +++ tests/integration/pipe-loopback-amqp.sh | 6 ------ tests/integration/pipe-loopback-mqtt.sh | 8 -------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03265d0c6..5e6025e60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,6 +175,9 @@ test:integration: when: always paths: - build/tests/integration/ + services: + - eclipse-mosquitto + - rabbitmq tags: - docker needs: diff --git a/tests/integration/pipe-loopback-amqp.sh b/tests/integration/pipe-loopback-amqp.sh index 851d2ff4c..21fa6ed0a 100755 --- a/tests/integration/pipe-loopback-amqp.sh +++ b/tests/integration/pipe-loopback-amqp.sh @@ -65,14 +65,8 @@ cat > ${CONFIG_FILE} << EOF } EOF -rabbitmq-server -detached - -sleep 5 - villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE} -rabbitmqctl stop - # Compare data villas-test-cmp ${CMPFLAGS} ${INPUT_FILE} ${OUTPUT_FILE} RC=$? diff --git a/tests/integration/pipe-loopback-mqtt.sh b/tests/integration/pipe-loopback-mqtt.sh index 8c424723b..307e54587 100755 --- a/tests/integration/pipe-loopback-mqtt.sh +++ b/tests/integration/pipe-loopback-mqtt.sh @@ -62,16 +62,8 @@ cat > ${CONFIG_FILE} << EOF } EOF -# Start broker -mosquitto & -MPID=$! - -sleep 1 - villas-pipe -l ${NUM_SAMPLES} ${CONFIG_FILE} node1 > ${OUTPUT_FILE} < ${INPUT_FILE} -kill $MPID - # Compare data villas-test-cmp ${INPUT_FILE} ${OUTPUT_FILE} RC=$?