Skip to content

Commit 0491399

Browse files
MyroTkMyroTk
committed
Secrets and branding updates
1 parent 52cdf02 commit 0491399

File tree

13 files changed

+149
-62
lines changed

13 files changed

+149
-62
lines changed

‎.github/workflows/regression.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ name: Regression test workflow
8888
env:
8989
# Force the stdout and stderr streams to be unbuffered
9090
PYTHONUNBUFFERED: 1
91-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
92-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
93-
AWS_DEFAULT_REGION: ${{ secrets.AWS_REPORT_REGION }}
91+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
92+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
93+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
9494
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
9595
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
9696
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
@@ -174,7 +174,7 @@ jobs:
174174
run: python3
175175
-u ${{ env.SUITE }}/regression.py
176176
--clickhouse-binary-path ${{ env.clickhouse_path }}
177-
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
177+
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
178178
${{ env.args }}
179179
- name: Set Commit Status
180180
if: always()
@@ -231,7 +231,7 @@ jobs:
231231
-u alter/regression.py
232232
--clickhouse-binary-path ${{ env.clickhouse_path }}
233233
--only "/alter/${{ matrix.ONLY }} partition/*"
234-
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
234+
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
235235
${{ env.args }}
236236
- name: Set Commit Status
237237
if: always()
@@ -296,7 +296,7 @@ jobs:
296296
--aws-s3-region ${{ secrets.REGRESSION_AWS_S3_REGION }}
297297
--aws-s3-key-id ${{ secrets.REGRESSION_AWS_S3_KEY_ID }}
298298
--aws-s3-access-key ${{ secrets.REGRESSION_AWS_S3_SECRET_ACCESS_KEY }}
299-
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
299+
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
300300
${{ env.args }}
301301
- name: Set Commit Status
302302
if: always()
@@ -350,7 +350,7 @@ jobs:
350350
-u ${{ env.SUITE }}/regression.py
351351
--ssl
352352
--clickhouse-binary-path ${{ env.clickhouse_path }}
353-
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
353+
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
354354
${{ env.args }}
355355
- name: Set Commit Status
356356
if: always()
@@ -406,7 +406,7 @@ jobs:
406406
run: python3
407407
-u ${{ env.SUITE }}/regression.py
408408
--clickhouse-binary-path ${{ env.clickhouse_path }}
409-
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
409+
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
410410
${{ env.args }}
411411
- name: Set Commit Status
412412
if: always()
@@ -458,7 +458,7 @@ jobs:
458458
run: python3
459459
-u ${{ env.SUITE }}/regression.py
460460
--clickhouse-binary-path ${{ env.clickhouse_path }}
461-
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
461+
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
462462
${{ env.args }}
463463
- name: Set Commit Status
464464
if: always()
@@ -521,7 +521,7 @@ jobs:
521521
--aws-s3-region ${{ secrets.REGRESSION_AWS_S3_REGION }}
522522
--aws-s3-key-id ${{ secrets.REGRESSION_AWS_S3_KEY_ID }}
523523
--aws-s3-access-key ${{ secrets.REGRESSION_AWS_S3_SECRET_ACCESS_KEY }}
524-
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
524+
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
525525
${{ env.args }}
526526
- name: Set Commit Status
527527
if: always()
@@ -586,7 +586,7 @@ jobs:
586586
--aws-s3-region ${{ secrets.REGRESSION_AWS_S3_REGION }}
587587
--aws-s3-key-id ${{ secrets.REGRESSION_AWS_S3_KEY_ID }}
588588
--aws-s3-access-key ${{ secrets.REGRESSION_AWS_S3_SECRET_ACCESS_KEY }}
589-
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
589+
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
590590
${{ env.args }}
591591
- name: Set Commit Status
592592
if: always()
@@ -650,7 +650,7 @@ jobs:
650650
--gcs-key-secret ${{ secrets.REGRESSION_GCS_KEY_SECRET }}
651651
--gcs-uri ${{ secrets.REGRESSION_GCS_URI }}
652652
--with-${{ matrix.STORAGE }}
653-
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
653+
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
654654
${{ env.args }}
655655
- name: Set Commit Status
656656
if: always()

‎.github/workflows/release_branches.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ env:
99
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1010
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
1111
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
12+
ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
1213

1314
on: # yamllint disable-line rule:truthy
1415
pull_request:
@@ -640,8 +641,8 @@ jobs:
640641
secrets: inherit
641642
with:
642643
runner_type: altinity-on-demand, altinity-regression-tester
643-
commit: 53d73ed32155a8a17ee0d0cdb15aee96c98010a2
644-
arch: release
644+
commit: c5f44e1c6fdc201a22f3f073b2311de10d2695b0
645+
arch: release
645646
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
646647

647648
RegressionTestsAarch64:
@@ -650,7 +651,7 @@ jobs:
650651
secrets: inherit
651652
with:
652653
runner_type: altinity-on-demand, altinity-regression-tester-aarch64
653-
commit: 53d73ed32155a8a17ee0d0cdb15aee96c98010a2
654+
commit: c5f44e1c6fdc201a22f3f073b2311de10d2695b0
654655
arch: aarch64
655656
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
656657

‎.github/workflows/reusable_build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ env:
4242
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
4343
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
4444
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
45+
CLICKHOUSE_TEST_STAT_LOGIN: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
46+
CLICKHOUSE_TEST_STAT_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
47+
CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}
48+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
49+
ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
4550

4651
jobs:
4752
runner_labels_setup:

‎.github/workflows/reusable_test.yml‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,39 @@ name: Testing workflow
4343
description: if given, it's passed to the environments
4444
required: false
4545
AWS_SECRET_ACCESS_KEY:
46-
description: the access key to the aws param store.
46+
description: the access key to the aws s3 bucket.
4747
required: true
4848
AWS_ACCESS_KEY_ID:
49-
description: the access key id to the aws param store.
49+
description: the access key id to the aws s3 bucket.
5050
required: true
51-
AWS_DEFAULT_REGION:
52-
description: the region of the aws param store.
51+
CLICKHOUSE_TEST_STAT_LOGIN:
52+
description: username for ci db.
53+
required: true
54+
CLICKHOUSE_TEST_STAT_PASSWORD:
55+
description: password for ci db.
56+
required: true
57+
CLICKHOUSE_TEST_STAT_URL:
58+
description: url for ci db.
59+
required: true
60+
DOCKER_PASSWORD:
61+
description: token to upload docker images.
62+
required: true
63+
ROBOT_TOKEN:
64+
description: token to update ci status.
5365
required: true
5466

5567
env:
5668
# Force the stdout and stderr streams to be unbuffered
5769
PYTHONUNBUFFERED: 1
5870
CHECK_NAME: ${{inputs.test_name}}
59-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
6071
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
6172
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
73+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
74+
CLICKHOUSE_TEST_STAT_LOGIN: ${{ secrets.CLICKHOUSE_TEST_STAT_LOGIN }}
75+
CLICKHOUSE_TEST_STAT_PASSWORD: ${{ secrets.CLICKHOUSE_TEST_STAT_PASSWORD }}
76+
CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}
77+
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
78+
ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
6279

6380
jobs:
6481
runner_labels_setup:

‎cmake/version.cmake‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ include(${PROJECT_SOURCE_DIR}/cmake/autogenerated_versions.txt)
33
set(VERSION_EXTRA "" CACHE STRING "")
44
set(VERSION_TWEAK "" CACHE STRING "")
55

6-
if (VERSION_TWEAK)
7-
string(CONCAT VERSION_STRING ${VERSION_STRING} "." ${VERSION_TWEAK})
8-
endif ()
6+
# NOTE(vnemkov): we rely on VERSION_TWEAK portion to be already present in VERSION_STRING
7+
# if (VERSION_TWEAK)
8+
# string(CONCAT VERSION_STRING ${VERSION_STRING} "." ${VERSION_TWEAK})
9+
# endif ()
910

1011
if (VERSION_EXTRA)
1112
string(CONCAT VERSION_STRING ${VERSION_STRING} "." ${VERSION_EXTRA})

‎tests/ci/clickhouse_helper.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#!/usr/bin/env python3
22
from pathlib import Path
3-
from typing import Dict, List, Optional
3+
from typing import Any, Dict, List, Optional
44
import fileinput
55
import json
66
import logging
77
import time
88

99
import requests # type: ignore
1010

11+
from env_helper import CLICKHOUSE_TEST_STAT_URL, CLICKHOUSE_TEST_STAT_PASSWORD, CLICKHOUSE_TEST_STAT_LOGIN
1112
from get_robot_token import get_parameter_from_ssm
1213
from pr_info import PRInfo
1314
from report import TestResults
@@ -30,8 +31,8 @@ def __init__(
3031

3132
self.url = url
3233
self.auth = auth or {
33-
"X-ClickHouse-User": get_parameter_from_ssm("clickhouse-test-stat-login"),
34-
"X-ClickHouse-Key": get_parameter_from_ssm("clickhouse-test-stat-password"),
34+
"X-ClickHouse-User": CLICKHOUSE_TEST_STAT_LOGIN,
35+
"X-ClickHouse-Key": CLICKHOUSE_TEST_STAT_PASSWORD,
3536
}
3637

3738
@staticmethod
@@ -41,6 +42,7 @@ def insert_file(
4142
query: str,
4243
file: Path,
4344
additional_options: Optional[Dict[str, str]] = None,
45+
**kwargs: Any,
4446
) -> None:
4547
params = {
4648
"query": query,
@@ -53,7 +55,7 @@ def insert_file(
5355

5456
with open(file, "rb") as data_fd:
5557
ClickHouseHelper._insert_post(
56-
url, params=params, data=data_fd, headers=auth
58+
url, params=params, data=data_fd, headers=auth, **kwargs
5759
)
5860

5961
@staticmethod

‎tests/ci/docker_images_check.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
1515
from commit_status_helper import format_description, get_commit, post_commit_status
16-
from env_helper import REPO_COPY, RUNNER_TEMP, GITHUB_RUN_URL
17-
from get_robot_token import get_best_robot_token, get_parameter_from_ssm
16+
from env_helper import DOCKER_PASSWORD, REPO_COPY, RUNNER_TEMP, GITHUB_RUN_URL
17+
from get_robot_token import get_best_robot_token
1818
from pr_info import PRInfo
1919
from report import TestResults, TestResult
2020
from s3_helper import S3Helper
@@ -426,7 +426,7 @@ def main():
426426
logging.info('Doing docker login')
427427
subprocess.check_output( # pylint: disable=unexpected-keyword-arg
428428
"docker login --username 'altinityinfra' --password-stdin",
429-
input=get_parameter_from_ssm("dockerhub-password"),
429+
input=DOCKER_PASSWORD,
430430
encoding="utf-8",
431431
shell=True,
432432
)

‎tests/ci/docker_manifests_merge.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
)
1919
from commit_status_helper import format_description, get_commit, post_commit_status
2020
from docker_images_helper import IMAGES_FILE_PATH, get_image_names
21-
from env_helper import RUNNER_TEMP, REPO_COPY
22-
from get_robot_token import get_best_robot_token, get_parameter_from_ssm
21+
from env_helper import DOCKER_PASSWORD, RUNNER_TEMP, REPO_COPY
22+
from get_robot_token import get_best_robot_token
2323
from git_helper import Runner
2424
from pr_info import PRInfo
2525
from report import TestResults, TestResult
@@ -251,7 +251,7 @@ def main():
251251
if args.push:
252252
subprocess.check_output( # pylint: disable=unexpected-keyword-arg
253253
"docker login --username 'altinityinfra' --password-stdin",
254-
input=get_parameter_from_ssm("dockerhub-password"),
254+
input=DOCKER_PASSWORD,
255255
encoding="utf-8",
256256
shell=True,
257257
)

‎tests/ci/docker_server.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
1818
from commit_status_helper import format_description, get_commit, post_commit_status
1919
from docker_images_check import DockerImage
20-
from env_helper import CI, GITHUB_RUN_URL, RUNNER_TEMP, S3_BUILDS_BUCKET, S3_DOWNLOAD
21-
from get_robot_token import get_best_robot_token, get_parameter_from_ssm
20+
from env_helper import DOCKER_PASSWORD, CI, GITHUB_RUN_URL, RUNNER_TEMP, S3_BUILDS_BUCKET, S3_DOWNLOAD
21+
from get_robot_token import get_best_robot_token
2222
from git_helper import Git
2323
from pr_info import PRInfo
2424
from report import TestResults, TestResult
@@ -342,7 +342,7 @@ def main():
342342
if args.push:
343343
subprocess.check_output( # pylint: disable=unexpected-keyword-arg
344344
"docker login --username 'altinityinfra' --password-stdin",
345-
input=get_parameter_from_ssm("dockerhub-password"),
345+
input=DOCKER_PASSWORD,
346346
encoding="utf-8",
347347
shell=True,
348348
)

‎tests/ci/env_helper.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/"
3939
"{pr_or_release}/{commit}/{build_name}/{artifact}"
4040
)
41+
CLICKHOUSE_TEST_STAT_LOGIN = os.getenv("CLICKHOUSE_TEST_STAT_LOGIN")
42+
CLICKHOUSE_TEST_STAT_PASSWORD = os.getenv("CLICKHOUSE_TEST_STAT_PASSWORD")
43+
CLICKHOUSE_TEST_STAT_URL = os.getenv("CLICKHOUSE_TEST_STAT_URL")
44+
DOCKER_PASSWORD = os.getenv("DOCKER_PASSWORD")
45+
ROBOT_TOKEN = os.getenv("ROBOT_TOKEN")
4146

4247
# These parameters are set only on demand, and only once
4348
_GITHUB_JOB_ID = ""

0 commit comments

Comments
 (0)