From dbb9bc2884914e52fa916fd3ef6441233cf75995 Mon Sep 17 00:00:00 2001
From: Carsten Patzke <carsten.patzke@desy.de>
Date: Fri, 17 Apr 2020 14:39:22 +0200
Subject: [PATCH] Changed some nomad config files to receiver_tcp
---
deploy/asapo_services/scripts/asapo-receivers.nmd.tpl | 2 +-
tests/automatic/high_avail/broker_mongo_restart/check_linux.sh | 2 +-
tests/manual/broker_debug_local/receiver.nmd | 2 +-
tests/manual/python_tests/producer/receiver.nmd | 2 +-
tests/manual/python_tests/producer_wait_bug_mongo/receiver.nmd | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
mode change 100644 => 100755 tests/automatic/high_avail/broker_mongo_restart/check_linux.sh
diff --git a/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl b/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
index bbbf4dfd8..efe823c70 100644
--- a/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
+++ b/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
@@ -83,7 +83,7 @@ job "asapo-receivers" {
template {
- source = "${scripts_dir}/receiver.json.tpl"
+ source = "${scripts_dir}/receiver_tcp.json.tpl"
destination = "local/config.json"
change_mode = "restart"
}
diff --git a/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh b/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh
old mode 100644
new mode 100755
index aab37e039..6e59dc8f2
--- a/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh
+++ b/tests/automatic/high_avail/broker_mongo_restart/check_linux.sh
@@ -60,7 +60,7 @@ Cleanup() {
}
-sed -i 's/27017/27016/g' receiver.json.tpl
+sed -i 's/27017/27016/g' receiver_tcp.json.tpl
sed -i 's/27017/27016/g' discovery.json.tpl
sed -i 's/info/debug/g' broker.json.tpl
diff --git a/tests/manual/broker_debug_local/receiver.nmd b/tests/manual/broker_debug_local/receiver.nmd
index bb4cfe877..6d7986648 100644
--- a/tests/manual/broker_debug_local/receiver.nmd
+++ b/tests/manual/broker_debug_local/receiver.nmd
@@ -36,7 +36,7 @@ job "receiver" {
}
template {
- source = "/home/yakubov/projects/asapo/cmake-build-debug/tests/automatic/producer_receiver/check_monitoring/receiver.json.tpl"
+ source = "/home/yakubov/projects/asapo/cmake-build-debug/tests/automatic/producer_receiver/check_monitoring/receiver_tcp.json.tpl"
destination = "local/receiver.json"
change_mode = "signal"
change_signal = "SIGHUP"
diff --git a/tests/manual/python_tests/producer/receiver.nmd b/tests/manual/python_tests/producer/receiver.nmd
index 75fbca574..a25edbf7b 100644
--- a/tests/manual/python_tests/producer/receiver.nmd
+++ b/tests/manual/python_tests/producer/receiver.nmd
@@ -36,7 +36,7 @@ job "receiver" {
}
template {
- source = "/home/yakubov/projects/asapo/cmake-build-debug/tests/automatic/full_chain/simple_chain/receiver.json.tpl"
+ source = "/home/yakubov/projects/asapo/cmake-build-debug/tests/automatic/full_chain/simple_chain/receiver_tcp.json.tpl"
destination = "local/receiver.json"
change_mode = "signal"
change_signal = "SIGHUP"
diff --git a/tests/manual/python_tests/producer_wait_bug_mongo/receiver.nmd b/tests/manual/python_tests/producer_wait_bug_mongo/receiver.nmd
index 75fbca574..a25edbf7b 100644
--- a/tests/manual/python_tests/producer_wait_bug_mongo/receiver.nmd
+++ b/tests/manual/python_tests/producer_wait_bug_mongo/receiver.nmd
@@ -36,7 +36,7 @@ job "receiver" {
}
template {
- source = "/home/yakubov/projects/asapo/cmake-build-debug/tests/automatic/full_chain/simple_chain/receiver.json.tpl"
+ source = "/home/yakubov/projects/asapo/cmake-build-debug/tests/automatic/full_chain/simple_chain/receiver_tcp.json.tpl"
destination = "local/receiver.json"
change_mode = "signal"
change_signal = "SIGHUP"
--
GitLab