diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d79bdc6f6422925ba78d3b6ccc12ac3bd58c5a7f..d3ec3ceeac952e7a3d8e3a6772062f344003f422 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,9 +62,7 @@ test-services-linux-debug: # - cd $CI_PROJECT_DIR/build/tests/automatic/common_scripts # - bash start_services.sh - cd $CI_PROJECT_DIR/build - #- ctest --no-compress-output -T Test -L "unit|memcheck_unit|coverage" --output-on-failure --output-junit testResult.xml - - ps aux - - ctest --no-compress-output -T Test -L "unit|memcheck_unit" --output-on-failure --output-junit testResult.xml + - ctest --no-compress-output -T Test -L "unit|memcheck_unit|coverage" --output-on-failure --output-junit testResult.xml tags: - kubernetes-executor rules: diff --git a/deploy/build_env/services-linux/Dockerfile b/deploy/build_env/services-linux/Dockerfile index b8bb25586ca57e8b1ca8839b69406bec190e3d0a..9290686f3f122bfeb045f155021591d5c51660a3 100644 --- a/deploy/build_env/services-linux/Dockerfile +++ b/deploy/build_env/services-linux/Dockerfile @@ -75,7 +75,6 @@ node_meta = {\n\ server=true\n\ bootstrap_expect=1\n\ telemetry = {\n\ - disable_compat_1.9 = false\n\ prometheus_retention_time = \"24h\"\n\ }" > /etc/consul.d/consul.hcl