From f1d923ad237955733d55c276be66c182725cffc9 Mon Sep 17 00:00:00 2001 From: Barak Amar Date: Mon, 4 Dec 2023 21:05:44 +0200 Subject: [PATCH] test: update esti to use LAKEFSACTION prefix for env (#7105) --- esti/action_files/action_pre_commit.yaml | 2 +- esti/ops/docker-compose-dynamodb.yaml | 2 +- esti/ops/docker-compose-external-db.yaml | 2 +- esti/ops/docker-compose.yaml | 2 +- esti/scripts/set_env_vars.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/esti/action_files/action_pre_commit.yaml b/esti/action_files/action_pre_commit.yaml index 4d61c0a3572..31e566e8fd6 100644 --- a/esti/action_files/action_pre_commit.yaml +++ b/esti/action_files/action_pre_commit.yaml @@ -9,4 +9,4 @@ hooks: properties: url: "{{.URL}}/pre-commit" query_params: - check_env_vars: "{{"{{ ENV.ACTIONS_VAR }}"}}" \ No newline at end of file + check_env_vars: "{{"{{ ENV.LAKEFSACTION_VAR }}"}}" \ No newline at end of file diff --git a/esti/ops/docker-compose-dynamodb.yaml b/esti/ops/docker-compose-dynamodb.yaml index 0a6c91b26c7..c1443b0e3f3 100644 --- a/esti/ops/docker-compose-dynamodb.yaml +++ b/esti/ops/docker-compose-dynamodb.yaml @@ -21,7 +21,7 @@ services: - LAKEFS_BLOCKSTORE_GS_CREDENTIALS_JSON - LAKEFS_STATS_ENABLED - LAKEFS_DATABASE_DYNAMODB_ENDPOINT=http://dynamodb:8000 - - ACTIONS_VAR=this_is_actions_var + - LAKEFSACTION_VAR=this_is_actions_var - LAKEFS_DATABASE_TYPE=dynamodb - LAKEFS_DATABASE_KV_ENABLED=true - LAKEFS_DATABASE_DYNAMODB_AWS_REGION=us-east-1 diff --git a/esti/ops/docker-compose-external-db.yaml b/esti/ops/docker-compose-external-db.yaml index ee74fafe65e..f060adfe4b9 100644 --- a/esti/ops/docker-compose-external-db.yaml +++ b/esti/ops/docker-compose-external-db.yaml @@ -19,7 +19,7 @@ services: - LAKEFS_BLOCKSTORE_AZURE_STORAGE_ACCESS_KEY - LAKEFS_LOGGING_LEVEL=DEBUG - LAKEFS_STATS_ENABLED=false - - ACTIONS_VAR=this_is_actions_var + - LAKEFSACTION_VAR=this_is_actions_var - LAKEFS_DATABASE_TYPE=cosmosdb - LAKEFS_DATABASE_COSMOSDB_ENDPOINT - LAKEFS_DATABASE_COSMOSDB_DATABASE diff --git a/esti/ops/docker-compose.yaml b/esti/ops/docker-compose.yaml index c0fbfc66d13..07f70605c7a 100644 --- a/esti/ops/docker-compose.yaml +++ b/esti/ops/docker-compose.yaml @@ -27,7 +27,7 @@ services: - AZURE_CLIENT_ID - AZURE_CLIENT_SECRET - AZURE_TENANT_ID - - ACTIONS_VAR=this_is_actions_var + - LAKEFSACTION_VAR=this_is_actions_var entrypoint: ["/app/wait-for", "postgres:5432", "--", "/app/lakefs", "run"] postgres: image: "postgres:11" diff --git a/esti/scripts/set_env_vars.sh b/esti/scripts/set_env_vars.sh index 1a5ac10327c..b42b3daa564 100755 --- a/esti/scripts/set_env_vars.sh +++ b/esti/scripts/set_env_vars.sh @@ -6,4 +6,4 @@ export ESTI_SETUP_LAKEFS="true" export ESTI_STORAGE_NAMESPACE="local://system-testing" # Lakefs env vars for test -export ACTIONS_VAR="this_is_actions_var" +export LAKEFSACTION_VAR="this_is_actions_var"