Skip to content
Snippets Groups Projects
Commit 603ee94d authored by Sergey Yakubov's avatar Sergey Yakubov
Browse files

update nomad config

parent 7296fd21
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 81 additions and 20 deletions
CMakeLists.txt
+ 2
− 2
View file @ 603ee94d
......@@ -47,11 +47,12 @@ message (STATUS "cURL include: ${CURL_INCLUDE_DIRS}")
# format sources
include(astyle)
include(prepare_version)
include(testing_cpp)
include(prepare_asapo)
if(BUILD_WORKER_TOOLS)
set (BUILD_MONGODB_CLIENTLIB ON)
endif()
......@@ -89,4 +90,3 @@ if(BUILD_DOCS)
include(doxygen)
endif()
include(prepare_version)
\ No newline at end of file
CMakeModules/prepare_version.cmake
+ 10
− 0
View file @ 603ee94d
execute_process(COMMAND git describe --tags --dirty OUTPUT_VARIABLE VERSION)
string(STRIP ${VERSION} VERSION)
execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE BRANCH)
string(STRIP ${BRANCH} BRANCH)
if (${BRANCH} STREQUAL "develop")
SET (ASAPO_VERSION ${BRANCH}.${VERSION})
else()
SET (ASAPO_VERSION ${BRANCH}.latest)
endif()
string(TIMESTAMP TIMESTAMP "%H:%M:%S %d.%m.%Y UTC" UTC)
configure_file(${PROJECT_SOURCE_DIR}/common/cpp/include/common/version.h.in ${PROJECT_SOURCE_DIR}/common/cpp/include/common/version.h @ONLY)
......
config/nomad/receiver.nmd.in
+ 1
− 0
View file @ 603ee94d
......@@ -19,6 +19,7 @@ job "receiver" {
memory = 256 # 256MB
network {
port "recv" {}
port "recv_ds" {}
}
}
......
deploy/nomad_jobs/asapo-brokers.nmd.in
+ 1
− 1
View file @ 603ee94d
......@@ -24,7 +24,7 @@ job "asapo-brokers" {
config {
network_mode = "host"
dns_servers = ["127.0.0.1"]
image = "yakser/asapo-broker:develop"
image = "yakser/asapo-broker:@ASAPO_VERSION@"
force_pull = true
volumes = ["local/config.json:/var/lib/broker/config.json"]
logging {
......
deploy/nomad_jobs/asapo-receivers.nmd.in
+ 3
− 1
View file @ 603ee94d
......@@ -24,7 +24,7 @@ job "asapo-receivers" {
config {
network_mode = "host"
dns_servers = ["127.0.0.1"]
image = "yakser/asapo-receiver:develop"
image = "yakser/asapo-receiver:@ASAPO_VERSION@"
force_pull = true
volumes = ["local/config.json:/var/lib/receiver/config.json",
"/bldocuments/support/asapo/data:/var/lib/receiver/data"]
......@@ -40,7 +40,9 @@ job "asapo-receivers" {
resources {
network {
port "recv" {}
port "recv_ds" {}
}
memory = 40000
}
service {
......
deploy/nomad_jobs/asapo-services.nmd.in
+ 2
− 2
View file @ 603ee94d
......@@ -12,7 +12,7 @@ job "asapo-services" {
config {
network_mode = "host"
dns_servers = ["127.0.0.1"]
image = "yakser/asapo-authorizer:develop"
image = "yakser/asapo-authorizer:@ASAPO_VERSION@"
force_pull = true
volumes = ["local/config.json:/var/lib/authorizer/config.json",
"/bldocuments/support/asapo/beamtime_beamline_mapping.txt:/var/lib/authorizer/beamtime_beamline_mapping.txt",
......@@ -71,7 +71,7 @@ job "asapo-services" {
config {
network_mode = "host"
dns_servers = ["127.0.0.1"]
image = "yakser/asapo-discovery:develop"
image = "yakser/asapo-discovery:@ASAPO_VERSION@"
force_pull = true
volumes = ["local/config.json:/var/lib/discovery/config.json"]
logging {
......
deploy/nomad_jobs/copy.sh.in 0 → 100755
+ 3
− 0
View file @ 603ee94d
#!/usr/bin/env bash
scp * psana002:@NOMAD_INSTALL@/
deploy/nomad_jobs/receiver.json.tpl
+ 2
− 2
View file @ 603ee94d
......@@ -7,11 +7,11 @@
"ListenPort": {{ env "NOMAD_PORT_recv" }},
"DataServer": {
"NThreads": 2,
"ListenPort": 23123
"ListenPort": {{ env "NOMAD_PORT_recv_ds" }}
},
"DataCache": {
"Use": true,
"SizeGB": 1,
"SizeGB": 30,
"ReservedShare": 10
},
"Tag": "{{ env "NOMAD_ADDR_recv" }}",
......
tests/automatic/settings/receiver.json.tpl.lin.in
+ 1
− 1
View file @ 603ee94d
......@@ -4,7 +4,7 @@
"BrokerDbAddress":"localhost:27017",
"DataServer": {
"NThreads": 2,
"ListenPort": 23123
"ListenPort": {{ env "NOMAD_PORT_recv_ds" }}
},
"DataCache": {
"Use": @RECEIVER_USE_CACHE@,
......
tests/automatic/settings/receiver.json.tpl.win.in
+ 1
− 1
View file @ 603ee94d
......@@ -7,7 +7,7 @@
"ListenPort": {{ env "NOMAD_PORT_recv" }},
"DataServer": {
"NThreads": 2,
"ListenPort": 23123
"ListenPort": {{ env "NOMAD_PORT_recv_ds" }}
},
"DataCache": {
"Use": @RECEIVER_USE_CACHE@,
......
tests/manual/tests_via_nomad/asapo-test_dummy_producer.nomad
+ 4
− 4
View file @ 603ee94d
......@@ -28,7 +28,7 @@ job "asapo-test" {
}
artifact {
source = "http://nims.desy.de/extra/asapo/dummy-data-producer.exe"
source = "http://nims.desy.de/extra/asapo/dummy-data-producer-@ASAPO_VERSION@.exe"
mode = "file"
destination = "local/dummy-data-producer.exe"
......@@ -75,7 +75,7 @@ job "asapo-test" {
}
artifact {
source = "http://nims.desy.de/extra/asapo/dummy-data-producer"
source = "http://nims.desy.de/extra/asapo/dummy-data-producer-@ASAPO_VERSION@"
}
# resources {
......@@ -128,7 +128,7 @@ job "asapo-test" {
}
artifact {
source = "http://nims.desy.de/extra/asapo/getnext_broker"
source = "http://nims.desy.de/extra/asapo/getnext_broker-@ASAPO_VERSION@"
}
}
......@@ -172,7 +172,7 @@ job "asapo-test" {
}
artifact {
source = "http://nims.desy.de/extra/asapo/getnext_broker"
source = "http://nims.desy.de/extra/asapo/getnext_broker-@ASAPO_VERSION@"
}
}
......
tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad
+ 2
− 2
View file @ 603ee94d
......@@ -111,7 +111,7 @@ job "asapo-test" {
# }
artifact {
source = "http://nims.desy.de/extra/asapo/getnext_broker"
source = "http://nims.desy.de/extra/asapo/getnext_broker-@ASAPO_VERSION@"
}
}
......@@ -155,7 +155,7 @@ job "asapo-test" {
# }
artifact {
source = "http://nims.desy.de/extra/asapo/getnext_broker"
source = "http://nims.desy.de/extra/asapo/getnext_broker-@ASAPO_VERSION@"
}
}
......
tests/manual/tests_via_nomad/asapo-test_filemon_producer_tolocal.nomad
+ 2
− 2
View file @ 603ee94d
......@@ -22,7 +22,7 @@ job "asapo-produceronly" {
}
artifact {
source = "http://nims.desy.de/extra/asapo/asapo-eventmon-producer.exe"
source = "http://nims.desy.de/extra/asapo/asapo-eventmon-producer-@ASAPO_VERSION@.exe"
mode = "file"
destination = "local/asapo-eventmon-producer.exe"
}
......@@ -78,7 +78,7 @@ job "asapo-produceronly" {
}
artifact {
source = "http://nims.desy.de/extra/asapo/asapo-eventmon-producer"
source = "http://nims.desy.de/extra/asapo/asapo-eventmon-producer-@ASAPO_VERSION@"
mode = "file"
destination = "local/asapo-eventmon-producer"
}
......
tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad
+ 2
− 2
View file @ 603ee94d
......@@ -22,7 +22,7 @@ job "asapo-filemon-producer" {
}
artifact {
source = "http://nims.desy.de/extra/asapo/asapo-eventmon-producer.exe"
source = "http://nims.desy.de/extra/asapo/asapo-eventmon-producer-@ASAPO_VERSION@.exe"
mode = "file"
destination = "local/asapo-eventmon-producer.exe"
}
......@@ -78,7 +78,7 @@ job "asapo-filemon-producer" {
}
artifact {
source = "http://nims.desy.de/extra/asapo/asapo-eventmon-producer"
source = "http://nims.desy.de/extra/asapo/asapo-eventmon-producer-@ASAPO_VERSION@"
mode = "file"
destination = "local/asapo-eventmon-producer"
}
......
tests/manual/tests_via_nomad/clean_after_tests.sh 0 → 100755
+ 27
− 0
View file @ 603ee94d
#!/usr/bin/env bash
mongoaddr=`dig +short @127.0.0.1 mongo.service.asapo | head -1`
database="asapo_test"
cont=$(ssh $mongoaddr bash -c "'docker ps | grep mongo'")
image=`echo "${cont##* }"`
rm -rf /bldocuments/support/asapo/data/test/asapo_test
rm -rf /bldocuments/support/asapo/data/test1/asapo_test1
rm -rf /bldocuments/support/asapo/data/test2/asapo_test2
mkdir /bldocuments/support/asapo/data/test/asapo_test
mkdir /bldocuments/support/asapo/data/test1/asapo_test1
mkdir /bldocuments/support/asapo/data/test2/asapo_test2
chown asapo: -R /bldocuments/support/asapo/data/test/
ssh $mongoaddr docker exec $image bash -c "'echo \"db.dropDatabase()\" | mongo --host $mongoaddr asapo_test'"
ssh $mongoaddr docker exec $image bash -c "'echo \"db.dropDatabase()\" | mongo --host $mongoaddr asapo_test1'"
ssh $mongoaddr docker exec $image bash -c "'echo \"db.dropDatabase()\" | mongo --host $mongoaddr asapo_test2'"
nomad stop asapo-brokers
nomad run asapo-brokers.nmd
\ No newline at end of file
tests/manual/tests_via_nomad/run_test.sh 0 → 100755
+ 7
− 0
View file @ 603ee94d
. ./clean_after_tests.sh
nomad stop asapo-filemon-producer
nomad run asapo-test_filemon_producer_toreceiver.nomad
sleep 1
nomad stop asapo-test
nomad run asapo-test_filegen_filemon.nomad
tests/manual/tests_via_nomad/run_test_dummy_producer.sh 0 → 100755
+ 4
− 0
View file @ 603ee94d
. ./clean_after_tests.sh
nomad stop asapo-test
nomad run asapo-test_dummy_producer_linux_noworker.nomad
tests/manual/tests_via_nomad/run_test_linuxonly.sh 0 → 100755
+ 7
− 0
View file @ 603ee94d
. ./clean_after_tests.sh
nomad stop asapo-filemon-producer
nomad run asapo-test_filemon_producer_toreceiver.nomad
sleep 1
nomad stop asapo-test
nomad run asapo-test_filegen_filemon_linuxonly.nomad
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

imprint | privacy | Conditions of Use