diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c0212097df4521b9ba4b9c8cdcb96532a85ece1..fbd4977786c0d33983024a4d7240d238dc861b32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,7 +119,7 @@ test-services-linux-debug: - cd $CI_PROJECT_DIR - 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 "full_chain_monitoring|noaccess|restart|logger_fluentd" --output-on-failure --output-junit testResult.xml + - ctest --no-compress-output -T Test -L all -E "noaccess|restart|logger_fluentd" --output-on-failure --output-junit testResult.xml tags: - kubernetes-executor rules: diff --git a/deploy/build_env/services-linux/run_asapo.sh b/deploy/build_env/services-linux/run_asapo.sh index 9ac050991f644d5743eee9bab3e3c382d810fe0b..9f6a72623af1eaca427da928dd0f155c5494d48c 100644 --- a/deploy/build_env/services-linux/run_asapo.sh +++ b/deploy/build_env/services-linux/run_asapo.sh @@ -7,6 +7,11 @@ cp build/monitoring/monitoring_server/asapo-monitoring-server /asapo-monitoring- cp deploy/asapo_services_light/*json / +cp deploy/asapo_services_light/envoy.yaml / + +wget https://github.com/envoyproxy/envoy/releases/download/v1.27.0/envoy-1.27.0-linux-x86_64 +cp envoy-1.27.0-linux-x86_64 /usr/bin/envoy + # 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 / diff --git a/deploy/build_env/services-linux/supervisord.conf b/deploy/build_env/services-linux/supervisord.conf index 08801145e812aa2c4fa1bf805582ef7da88bc6d9..39ba3b73c4707738f23af4761615141fd1e11b4e 100644 --- a/deploy/build_env/services-linux/supervisord.conf +++ b/deploy/build_env/services-linux/supervisord.conf @@ -86,3 +86,10 @@ stderr_logfile=/tmp/consul_err.log stderr_logfile_maxbytes = 0 stdout_logfile=/tmp/consul_out.log stdout_logfile_maxbytes = 0 + +[program:envoyproxy] +command=envoy -c /envoy.yaml +stderr_logfile=/tmp/envoy_err.log +stderr_logfile_maxbytes = 0 +stdout_logfile=/tmp/envoy_out.log +stdout_logfile_maxbytes = 0