diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fad0bebc1a8cee3279cb7c5ea0ff1f5d89517fc4..b85739962782692d97ee3f575498902bb154ee3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -117,7 +117,7 @@ test-services-linux-debug: stage: test script: - cd $CI_PROJECT_DIR - - bash /run_asapo.sh + - bash $CI_PROJECT_DIR/deploy/build_env/services-linux/run_asapo.sh - cd $CI_PROJECT_DIR/build - ctest --no-compress-output -T Test -L all -E "kafka|full_chain_monitoring|noaccess|restart|logger_fluentd" --output-on-failure --output-junit testResult.xml tags: diff --git a/deploy/build_env/services-linux/Dockerfile b/deploy/build_env/services-linux/Dockerfile index 0f98bfa803e7a69be6c2d56aaa60dbd19af8ffee..3f2bdad197d969127c4f65106b8e8243a6786d10 100644 --- a/deploy/build_env/services-linux/Dockerfile +++ b/deploy/build_env/services-linux/Dockerfile @@ -139,7 +139,3 @@ nisNetgroupTriple: (blabla2,-,)\n\ " > /etc/ldap/record.ldif RUN mkdir -p /var/log/supervisord/ - -COPY *.key / -COPY supervisord.conf /etc/ -COPY run_asapo.sh / diff --git a/deploy/build_env/services-linux/receiver_kafka.json b/deploy/build_env/services-linux/receiver_kafka.json new file mode 100644 index 0000000000000000000000000000000000000000..fc3afc32192b0b6d3344bfca407281f73fa295d6 --- /dev/null +++ b/deploy/build_env/services-linux/receiver_kafka.json @@ -0,0 +1,39 @@ +{ + "MonitoringServer": "auto", + "PerformanceDbServer":"localhost:8086", + "MonitorPerformance": true, + "PerformanceDbName": "db_test", + "DatabaseServer":"auto", + "DiscoveryServer": "localhost:8410", + "DataServer": { + "AdvertiseURI": "127.0.0.1:8431", + "NThreads": 2, + "ListenPort": 8431, + "NetworkMode": ["tcp"] + }, + "Metrics": { + "Expose": true, + "ListenPort": 8430 + }, + "DataCache": { + "Use": true, + "SizeGB": 1, + "ReservedShare": 10 + }, + "AuthorizationServer": "localhost:8412", + "AuthorizationInterval": 1000, + "ListenPort": 8411, + "Tag": "localhost", + "ReceiveToDiskThresholdMB":50, + "MaxNumPersistedStreams":100, + "LogLevel" : "debug", + "Kafka" : { + "Enabled" : true, + "KafkaClient": { + "metadata.broker.list": "BROKER_LIST" + }, + "KafkaTopics": { + "asapo": {} + } + } + } diff --git a/deploy/build_env/services-linux/run_asapo.sh b/deploy/build_env/services-linux/run_asapo.sh index b62b0e45358a7e67d780a644e68528f834e7558e..9ac050991f644d5743eee9bab3e3c382d810fe0b 100644 --- a/deploy/build_env/services-linux/run_asapo.sh +++ b/deploy/build_env/services-linux/run_asapo.sh @@ -7,9 +7,13 @@ cp build/monitoring/monitoring_server/asapo-monitoring-server /asapo-monitoring- cp deploy/asapo_services_light/*json / -# Two receiver configs (tcp and fabric) are required for tests +# Several receiver configs (tcp and fabric) are required for tests cp deploy/asapo_services_light/receiver.json /receiver_tcp.json cp deploy/build_env/services-linux/receiver_fabric.json / +cp deploy/build_env/services-linux/receiver_kafka.json / + +cp deploy/build_env/services-linux/*key / +cp deploy/build_env/services-linux/supervisord.conf /etc/ cp build/deploy/asapo_services_light/nginx.conf /etc/nginx/nginx.conf