Browse Source

Do not set YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS as global env var (#4571)

Maxim Yurchuk 10 months ago
parent
commit
04c06c9651

+ 3 - 4
.github/actions/setup_ci_ydb_service_account_key_file_credentials/action.yml

@@ -12,10 +12,9 @@ runs:
       shell: bash
       run: |
         set -eu
-        export YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS=/tmp/ydb_service_account.json
-        cat << EOF > $YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS
+        export CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS=/tmp/ydb_service_account.json
+        cat << EOF > $CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS
         ${{ inputs.ci_ydb_service_account_key_file_credentials}}
         EOF
 
-        # This env var interfere with tests, temporary disabled
-        # echo "YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS=$YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS" >> $GITHUB_ENV
+        echo "CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS=$CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS" >> $GITHUB_ENV

+ 6 - 2
.github/scripts/send_build_stats.py

@@ -48,9 +48,13 @@ def sanitize_str(s):
 
 
 def main():
-    if "YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS" not in os.environ:
-        print("Env variable YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS is missing, skipping")
+    if "CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS" not in os.environ:
+        print("Env variable CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS is missing, skipping")
         return 1
+    
+    # Do not set up 'real' variable from gh workflows because it interfere with ydb tests 
+    # So, set up it locally
+    os.environ["YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS"] = os.environ["CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS"]
 
     with ydb.Driver(
         endpoint="grpcs://ydb.serverless.yandexcloud.net:2135",