From ec1296f04dd3a5d512c7cec9553c86186975e0bf Mon Sep 17 00:00:00 2001
From: George Sedov <radist.morse@gmail.com>
Date: Sat, 10 Sep 2022 02:06:26 +0200
Subject: [PATCH] fix config for consul
---
.gitlab-ci.yml | 4 +---
deploy/build_env/services-linux/Dockerfile | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d79bdc6f6..d3ec3ceea 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 b8bb25586..9290686f3 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
--
GitLab