From 54f953f26cd1aae7ccb921121057b79559f73dd3 Mon Sep 17 00:00:00 2001 From: alesapin Date: Tue, 9 Nov 2021 20:40:23 +0300 Subject: [PATCH] Fix --- .github/workflows/backport.yml | 3 ++- tests/ci/cherry_pick.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index e2f12f32a4c..e5f2666972f 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -21,7 +21,8 @@ jobs: - name: Cherry pick env: TEMP_PATH: ${{runner.temp}}/cherry_pick - ROBOT_CLICKHOUSE_SSH_KEY: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}} + ROBOT_CLICKHOUSE_SSH_KEY: ${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}} + ROBOT_CLICKHOUSE_TOKEN: ${{secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN}} REPO_OWNER: "ClickHouse" REPO_NAME: "ClickHouse" REPO_TEAM: "core" diff --git a/tests/ci/cherry_pick.py b/tests/ci/cherry_pick.py index 112b58ef1cf..885c6768eaa 100644 --- a/tests/ci/cherry_pick.py +++ b/tests/ci/cherry_pick.py @@ -5,7 +5,6 @@ import logging import os import subprocess -from get_robot_token import get_parameter_from_ssm from ssh import SSHKey from cherry_pick_utils.backport import Backport from cherry_pick_utils.cherrypick import CherryPick @@ -24,7 +23,7 @@ if __name__ == "__main__": with SSHKey("ROBOT_CLICKHOUSE_SSH_KEY"): - token = get_parameter_from_ssm("github_robot_token_1") + token = os.getenv("ROBOT_CLICKHOUSE_TOKEN") bp = Backport(token, os.environ.get("REPO_OWNER"), os.environ.get("REPO_NAME"), os.environ.get("REPO_TEAM")) def cherrypick_run(token, pr, branch):