Skip to content

Commit 837d43a

Browse files
authored
fix: integration tests telemetry env (risingwavelabs#8705)
1 parent 3e8ce31 commit 837d43a

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

docker/docker-compose.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ services:
2828
- "./risingwave.toml:/risingwave.toml"
2929
environment:
3030
RUST_BACKTRACE: "1"
31+
# If ENABLE_TELEMETRY is not set, telemetry will start by default
32+
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
3133
container_name: compactor-0
3234
healthcheck:
3335
test:
@@ -67,6 +69,8 @@ services:
6769
- "./risingwave.toml:/risingwave.toml"
6870
environment:
6971
RUST_BACKTRACE: "1"
72+
# If ENABLE_TELEMETRY is not set, telemetry will start by default
73+
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
7074
container_name: compute-node-0
7175
healthcheck:
7276
test:
@@ -146,6 +150,8 @@ services:
146150
- "./risingwave.toml:/risingwave.toml"
147151
environment:
148152
RUST_BACKTRACE: "1"
153+
# If ENABLE_TELEMETRY is not set, telemetry will start by default
154+
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
149155
container_name: frontend-node-0
150156
healthcheck:
151157
test:
@@ -216,6 +222,8 @@ services:
216222
- "./risingwave.toml:/risingwave.toml"
217223
environment:
218224
RUST_BACKTRACE: "1"
225+
# If ENABLE_TELEMETRY is not set, telemetry will start by default
226+
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY}
219227
container_name: meta-node-0
220228
healthcheck:
221229
test:
@@ -244,7 +252,17 @@ services:
244252
depends_on: []
245253
volumes:
246254
- "minio-0:/data"
247-
entrypoint: "\n/bin/sh -c '\nset -e\nmkdir -p \"/data/hummock001\"\n/usr/bin/docker-entrypoint.sh \"$$0\" \"$$@\"\n'"
255+
entrypoint: "
256+
257+
/bin/sh -c '
258+
259+
set -e
260+
261+
mkdir -p \"/data/hummock001\"
262+
263+
/usr/bin/docker-entrypoint.sh \"$$0\" \"$$@\"
264+
265+
'"
248266
environment:
249267
MINIO_CI_CD: "1"
250268
MINIO_PROMETHEUS_AUTH_TYPE: public

integration_tests/scripts/run_demos.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def run_demo(demo: str, format: str):
4242
run_sql_file(sql_file, demo_dir)
4343
sleep(10)
4444

45+
4546
def run_iceberg_demo():
4647
demo = "iceberg-sink"
4748
file_dir = dirname(abspath(__file__))
@@ -69,7 +70,7 @@ def run_iceberg_demo():
6970

7071
query_sql = open(os.path.join(demo_dir, "iceberg-query.sql")).read()
7172

72-
print("querying iceberg with presto sql: %s"%query_sql)
73+
print("querying iceberg with presto sql: %s" % query_sql)
7374

7475
query_output_file_name = "query_outout.txt"
7576

@@ -86,8 +87,6 @@ def run_iceberg_demo():
8687
assert len(output_content.strip()) > 0
8788

8889

89-
90-
9190
arg_parser = argparse.ArgumentParser(description='Run the demo')
9291
arg_parser.add_argument('--format',
9392
metavar='format',
@@ -100,6 +99,9 @@ def run_iceberg_demo():
10099
help='the test case')
101100
args = arg_parser.parse_args()
102101

102+
# disable telemetry in env
103+
os.environ['ENABLE_TELEMETRY'] = "false"
104+
103105
if args.case == "iceberg-sink":
104106
if args.format == "protobuf":
105107
print("skip protobuf test for iceberg-sink")

0 commit comments

Comments
 (0)