Skip to content

Commit 885ea91

Browse files
committed
pass azure credentials to stateless tests
1 parent 3a0cd4f commit 885ea91

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

ci/defs/job_configs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
command='python3 ./ci/jobs/functional_tests.py --options "{PARAMETER}"',
2525
# some tests can be flaky due to very slow disks - use tmpfs for temporary ClickHouse files
2626
# --cap-add=SYS_PTRACE and --privileged for gdb in docker
27-
run_in_docker="altinityinfra/stateless-test+--cap-add=SYS_PTRACE+--privileged+--security-opt seccomp=unconfined+--tmpfs /tmp/clickhouse+--volume=./ci/tmp/var/lib/clickhouse:/var/lib/clickhouse+--volume=./ci/tmp/etc/clickhouse-client:/etc/clickhouse-client+--volume=./ci/tmp/etc/clickhouse-server:/etc/clickhouse-server+--volume=./ci/tmp/etc/clickhouse-server1:/etc/clickhouse-server1+--volume=./ci/tmp/etc/clickhouse-server2:/etc/clickhouse-server2+--volume=./ci/tmp/var/log:/var/log",
27+
run_in_docker="altinityinfra/stateless-test+--cap-add=SYS_PTRACE+--privileged+--security-opt seccomp=unconfined+--tmpfs /tmp/clickhouse+--volume=./ci/tmp/var/lib/clickhouse:/var/lib/clickhouse+--volume=./ci/tmp/etc/clickhouse-client:/etc/clickhouse-client+--volume=./ci/tmp/etc/clickhouse-server:/etc/clickhouse-server+--volume=./ci/tmp/etc/clickhouse-server1:/etc/clickhouse-server1+--volume=./ci/tmp/etc/clickhouse-server2:/etc/clickhouse-server2+--volume=./ci/tmp/var/log:/var/log+--env=AZURE_STORAGE_KEY=$AZURE_STORAGE_KEY+--env=AZURE_ACCOUNT_NAME=$AZURE_ACCOUNT_NAME+--env=AZURE_CONTAINER_NAME=$AZURE_CONTAINER_NAME+--env=AZURE_STORAGE_ACCOUNT_URL=$AZURE_STORAGE_ACCOUNT_URL",
2828
digest_config=Job.CacheDigestConfig(
2929
include_paths=[
3030
"./ci/jobs/functional_tests.py",

ci/jobs/functional_tests.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,12 @@ def main():
170170

171171
if not info.is_local_run:
172172
# TODO: find a way to work with Azure secret so it's ok for local tests as well, for now keep azure disabled
173-
os.environ["AZURE_CONNECTION_STRING"] = Shell.get_output(
174-
f"aws ssm get-parameter --region us-east-1 --name azure_connection_string --with-decryption --output text --query Parameter.Value",
175-
verbose=True,
176-
)
173+
# os.environ["AZURE_CONNECTION_STRING"] = Shell.get_output(
174+
# f"aws ssm get-parameter --region us-east-1 --name azure_connection_string --with-decryption --output text --query Parameter.Value",
175+
# verbose=True,
176+
# )
177+
# NOTE(strtgbb): We pass azure credentials through the docker command, not SSM.
178+
pass
177179
else:
178180
print("Disable azure for a local run")
179181
config_installs_args += " --no-azure"

0 commit comments

Comments
 (0)