diff options
author | nikita kozlovsky <nmk@ydb.tech> | 2024-06-18 15:12:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-18 15:12:36 +0200 |
commit | bb46a5ee64eda6e2242d3b5feaf8396be86fd3f7 (patch) | |
tree | 25290fa8817ee0d7c606d0af8513fe832ada2cd4 | |
parent | 3f5927ff51c7676ef32cda0374a4770a90954355 (diff) | |
download | ydb-bb46a5ee64eda6e2242d3b5feaf8396be86fd3f7.tar.gz |
Ci env fix (#5662)
-rw-r--r-- | .github/actions/build_and_test_ya/action.yml | 2 | ||||
-rw-r--r-- | .github/actions/build_ya/action.yml | 6 | ||||
-rw-r--r-- | .github/actions/test/action.yml | 8 | ||||
-rw-r--r-- | .github/actions/test_ya/action.yml | 15 | ||||
-rw-r--r-- | .github/workflows/acceptance_run.yml | 4 | ||||
-rw-r--r-- | .github/workflows/build_analytics.yml | 6 | ||||
-rw-r--r-- | .github/workflows/build_and_test_ondemand.yml | 2 | ||||
-rw-r--r-- | .github/workflows/build_and_test_provisioned.yml | 2 | ||||
-rw-r--r-- | .github/workflows/build_and_test_ya.yml | 4 | ||||
-rw-r--r-- | .github/workflows/postcommit_asan.yml | 4 | ||||
-rw-r--r-- | .github/workflows/postcommit_relwithdebinfo.yml | 4 | ||||
-rw-r--r-- | .github/workflows/pr_check.yml | 4 |
12 files changed, 37 insertions, 24 deletions
diff --git a/.github/actions/build_and_test_ya/action.yml b/.github/actions/build_and_test_ya/action.yml index 76dec553d1..5749b7178e 100644 --- a/.github/actions/build_and_test_ya/action.yml +++ b/.github/actions/build_and_test_ya/action.yml @@ -126,7 +126,7 @@ runs: build_preset: ${{ inputs.build_preset }} test_size: ${{ inputs.test_size }} test_type: ${{ inputs.test_type }} - testman_token: ${{ fromJSON( inputs.secs ).TESTMO_TOKEN }} + testman_token: ${{ fromJSON( inputs.secs ).TESTMO_TOKEN2 }} testman_url: ${{ fromJSON( inputs.vars ).TESTMO_URL }} testman_project_id: ${{ fromJSON( inputs.vars ).TESTMO_PROJECT_ID }} link_threads: ${{ inputs.link_threads }} diff --git a/.github/actions/build_ya/action.yml b/.github/actions/build_ya/action.yml index 666d9bb194..555f96f706 100644 --- a/.github/actions/build_ya/action.yml +++ b/.github/actions/build_ya/action.yml @@ -51,7 +51,6 @@ runs: rm -rf $TMP_DIR && mkdir $TMP_DIR echo "BUILD_PRESET=$build_preset" >> $GITHUB_ENV - echo "GITHUB_TOKEN=${{ github.token }}" >> $GITHUB_ENV echo "LOG_URL=$log_url" >> $GITHUB_ENV echo "log_url=$log_url" >> $GITHUB_OUTPUT @@ -120,7 +119,7 @@ runs: echo "::debug::get version" ./ya --version - echo "Build **{platform_name}-${BUILD_PRESET}** is running..." | .github/scripts/tests/comment-pr.py + echo "Build **{platform_name}-${BUILD_PRESET}** is running..." | GITHUB_TOKEN="${{ github.token }}" .github/scripts/tests/comment-pr.py # to be sure set -o pipefail @@ -147,8 +146,11 @@ runs: - name: comment-build-status if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target' shell: bash + env: + GITHUB_TOKEN: ${{ github.token }} run: | set -x + if [ "${{ steps.build.outputs.status }}" == "failed" ]; then curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{github.token}}" -H "X-GitHub-Api-Version: 2022-11-28" \ https://api.github.com/repos/${{github.repository}}/statuses/${{github.event.pull_request.head.sha}} \ diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 3b712d2492..54db3d5a98 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -48,7 +48,6 @@ runs: echo "TESTREPDIR=$(pwd)/test_reports" >> $GITHUB_ENV echo "TMPDIR=$(pwd)/tmp" >> $GITHUB_ENV echo "PYTESTREPDIR=$(pwd)/test_reports/pytest/" >> $GITHUB_ENV - echo "TESTMO_TOKEN=${{inputs.testman_token}}" >> $GITHUB_ENV echo "TESTMO_URL=${{inputs.testman_url}}" >> $GITHUB_ENV echo "ARTIFACTS_DIR=$(pwd)/artifacts" >> $GITHUB_ENV echo "SUMMARY_LINKS=$(mktemp)" >> $GITHUB_ENV @@ -90,6 +89,7 @@ runs: shell: bash env: PR_NUMBER: ${{ github.event.number }} + TESTMO_TOKEN: ${{ inputs.testman_token }} run: | RUN_URL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" BRANCH_TAG="$GITHUB_REF_NAME" @@ -226,6 +226,8 @@ runs: - name: Unit test history upload results if: always() && inputs.run_unit_tests == 'true' && inputs.testman_token shell: bash + env: + TESTMO_TOKEN: ${{ inputs.testman_token }} run: | testmo automation:run:submit-thread \ --instance "$TESTMO_URL" --run-id ${{steps.th.outputs.runid}} \ @@ -300,6 +302,8 @@ runs: - name: Functional tests history upload results if: always() && inputs.run_functional_tests == 'true' && inputs.testman_token shell: bash + env: + TESTMO_TOKEN: ${{ inputs.testman_token }} run: | testmo automation:run:submit-thread \ --instance "$TESTMO_URL" --run-id ${{steps.th.outputs.runid}} \ @@ -309,6 +313,8 @@ runs: - name: Test history run complete if: always() && inputs.testman_token shell: bash + env: + TESTMO_TOKEN: ${{ inputs.testman_token }} run: | testmo automation:run:complete --instance "$TESTMO_URL" --run-id ${{steps.th.outputs.runid}} diff --git a/.github/actions/test_ya/action.yml b/.github/actions/test_ya/action.yml index df6244a8eb..ab2e1ff62f 100644 --- a/.github/actions/test_ya/action.yml +++ b/.github/actions/test_ya/action.yml @@ -54,10 +54,8 @@ runs: echo "REPORTS_ARTIFACTS_DIR=$TMP_DIR/artifacts/test_reports" >> $GITHUB_ENV echo "JUNIT_REPORT_XML=$TMP_DIR/junit.xml" >> $GITHUB_ENV echo "JUNIT_REPORT_PARTS=$TMP_DIR/junit-split" >> $GITHUB_ENV - echo "TESTMO_TOKEN=${{ inputs.testman_token }}" >> $GITHUB_ENV echo "TESTMO_URL=${{ inputs.testman_url }}" >> $GITHUB_ENV echo "SUMMARY_LINKS=$(mktemp)" >> $GITHUB_ENV - echo "GITHUB_TOKEN=${{ github.token }}" >> $GITHUB_ENV echo "BUILD_PRESET=${{ inputs.build_preset }}" >> $GITHUB_ENV echo "YA_TEST_LOG_FILENAME=$LOG_DIR/ya_test.log" >> $GITHUB_ENV @@ -87,6 +85,7 @@ runs: shell: bash env: PR_NUMBER: ${{ github.event.number }} + TESTMO_TOKEN: ${{ inputs.testman_token }} run: | set -x RUN_URL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" @@ -211,8 +210,8 @@ runs: echo "::debug::get version" ./ya --version - echo "Tests are running..." | .github/scripts/tests/comment-pr.py - + echo "Tests are running..." | GITHUB_TOKEN="${{ github.token }}" .github/scripts/tests/comment-pr.py + ./ya test ${{ inputs.build_target }} "${params[@]}" \ --stat --log-file "$YA_TEST_LOG_FILENAME" -DCONSISTENT_DEBUG \ --no-dir-outputs \ @@ -261,6 +260,8 @@ runs: - name: Unit test history upload results if: inputs.testman_token shell: bash + env: + TESTMO_TOKEN: ${{ inputs.testman_token }} run: | set -x PROXY_ADDR=127.0.0.1:8888 @@ -287,6 +288,8 @@ runs: - name: Test history run complete if: always() && inputs.testman_token shell: bash + env: + TESTMO_TOKEN: ${{ inputs.testman_token }} run: | testmo automation:run:complete --instance "$TESTMO_URL" --run-id ${{ steps.th.outputs.runid }} @@ -302,6 +305,8 @@ runs: - name: write tests summary shell: bash if: always() + env: + GITHUB_TOKEN: ${{ github.token }} run: | set -x mkdir $ARTIFACTS_DIR/summary/ @@ -311,7 +316,7 @@ runs: .github/scripts/tests/generate-summary.py \ --summary-out-path $ARTIFACTS_DIR/summary/ \ --summary-url-prefix $S3_URL_PREFIX/summary/ \ - --test-history-url $TEST_HISTORY_URL \ + --test-history-url "$TEST_HISTORY_URL" \ --test-log-url="$YA_TEST_LOG_URL" \ --build-preset "$BUILD_PRESET" \ --status-report-file statusrep.txt \ diff --git a/.github/workflows/acceptance_run.yml b/.github/workflows/acceptance_run.yml index 39f34b35d8..5d3c9a6d8a 100644 --- a/.github/workflows/acceptance_run.yml +++ b/.github/workflows/acceptance_run.yml @@ -54,7 +54,7 @@ jobs: test_type: unittest,py3test,py2test,pytest test_threads: 1 put_build_results_to_cache: true - secs: ${{ format('{{"TESTMO_TOKEN":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', - secrets.TESTMO_TOKEN, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} + secs: ${{ format('{{"TESTMO_TOKEN2":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', + secrets.TESTMO_TOKEN2, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} vars: ${{ format('{{"AWS_BUCKET":"{0}","AWS_ENDPOINT":"{1}","REMOTE_CACHE_URL":"{2}","TESTMO_URL":"{3}","TESTMO_PROJECT_ID":"{4}"}}', vars.AWS_BUCKET, vars.AWS_ENDPOINT, vars.REMOTE_CACHE_URL_YA, vars.TESTMO_URL, vars.TESTMO_PROJECT_ID ) }} diff --git a/.github/workflows/build_analytics.yml b/.github/workflows/build_analytics.yml index 95fbc54cbb..2a7fc15e16 100644 --- a/.github/workflows/build_analytics.yml +++ b/.github/workflows/build_analytics.yml @@ -51,8 +51,8 @@ jobs: run_tests: false put_build_results_to_cache: false additional_ya_make_args: "-DDUMP_LINKER_MAP -DCOMPILER_TIME_TRACE --add-result .json" - secs: ${{ format('{{"TESTMO_TOKEN":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', - secrets.TESTMO_TOKEN, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} + secs: ${{ format('{{"TESTMO_TOKEN2":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', + secrets.TESTMO_TOKEN2, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} vars: ${{ format('{{"AWS_BUCKET":"{0}","AWS_ENDPOINT":"{1}","REMOTE_CACHE_URL":"{2}","TESTMO_URL":"{3}","TESTMO_PROJECT_ID":"{4}"}}', vars.AWS_BUCKET, vars.AWS_ENDPOINT, vars.REMOTE_CACHE_URL_YA, vars.TESTMO_URL, vars.TESTMO_PROJECT_ID ) }} @@ -63,6 +63,6 @@ jobs: build_preset: ${{ inputs.build_preset || 'relwithdebinfo'}} build_target: ${{ inputs.build_target || 'ydb/apps/ydbd'}} secs: ${{ format('{{"TESTMO_TOKEN":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', - secrets.TESTMO_TOKEN, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} + secrets.TESTMO_TOKEN2, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} vars: ${{ format('{{"AWS_BUCKET":"{0}","AWS_ENDPOINT":"{1}","REMOTE_CACHE_URL":"{2}","TESTMO_URL":"{3}","TESTMO_PROJECT_ID":"{4}"}}', vars.AWS_BUCKET, vars.AWS_ENDPOINT, vars.REMOTE_CACHE_URL_YA, vars.TESTMO_URL, vars.TESTMO_PROJECT_ID ) }} diff --git a/.github/workflows/build_and_test_ondemand.yml b/.github/workflows/build_and_test_ondemand.yml index 97b11292a6..6b4320e499 100644 --- a/.github/workflows/build_and_test_ondemand.yml +++ b/.github/workflows/build_and_test_ondemand.yml @@ -118,7 +118,7 @@ jobs: aws_key_value: ${{secrets.AWS_KEY_VALUE}} aws_bucket: ${{vars.AWS_BUCKET}} aws_endpoint: ${{vars.AWS_ENDPOINT}} - testman_token: ${{secrets.TESTMO_TOKEN}} + testman_token: ${{secrets.TESTMO_TOKEN2}} testman_url: ${{vars.TESTMO_URL}} testman_project_id: ${{vars.TESTMO_PROJECT_ID}} run_unit_tests: ${{inputs.run_unit_tests}} diff --git a/.github/workflows/build_and_test_provisioned.yml b/.github/workflows/build_and_test_provisioned.yml index d610b9d0a7..5feaaded79 100644 --- a/.github/workflows/build_and_test_provisioned.yml +++ b/.github/workflows/build_and_test_provisioned.yml @@ -86,7 +86,7 @@ jobs: aws_key_value: ${{secrets.AWS_KEY_VALUE}} aws_bucket: ${{vars.AWS_BUCKET}} aws_endpoint: ${{vars.AWS_ENDPOINT}} - testman_token: ${{secrets.TESTMO_TOKEN}} + testman_token: ${{secrets.TESTMO_TOKEN2}} testman_url: ${{vars.TESTMO_URL}} testman_project_id: ${{vars.TESTMO_PROJECT_ID}} run_unit_tests: ${{inputs.run_unit_tests}} diff --git a/.github/workflows/build_and_test_ya.yml b/.github/workflows/build_and_test_ya.yml index bf9639ed92..eaaeef6928 100644 --- a/.github/workflows/build_and_test_ya.yml +++ b/.github/workflows/build_and_test_ya.yml @@ -81,7 +81,7 @@ jobs: test_type: ${{ inputs.test_type }} test_threads: ${{ inputs.test_threads }} put_build_results_to_cache: ${{ inputs.put_build_results_to_cache }} - secs: ${{ format('{{"TESTMO_TOKEN":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', - secrets.TESTMO_TOKEN, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} + secs: ${{ format('{{"TESTMO_TOKEN2":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', + secrets.TESTMO_TOKEN2, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} vars: ${{ format('{{"AWS_BUCKET":"{0}","AWS_ENDPOINT":"{1}","REMOTE_CACHE_URL":"{2}","TESTMO_URL":"{3}","TESTMO_PROJECT_ID":"{4}"}}', vars.AWS_BUCKET, vars.AWS_ENDPOINT, vars.REMOTE_CACHE_URL_YA, vars.TESTMO_URL, vars.TESTMO_PROJECT_ID ) }} diff --git a/.github/workflows/postcommit_asan.yml b/.github/workflows/postcommit_asan.yml index e90d560535..79650fcfe4 100644 --- a/.github/workflows/postcommit_asan.yml +++ b/.github/workflows/postcommit_asan.yml @@ -34,7 +34,7 @@ jobs: test_size: "small,medium" test_threads: 52 put_build_results_to_cache: true - secs: ${{ format('{{"TESTMO_TOKEN":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', - secrets.TESTMO_TOKEN, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} + secs: ${{ format('{{"TESTMO_TOKEN2":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', + secrets.TESTMO_TOKEN2, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} vars: ${{ format('{{"AWS_BUCKET":"{0}","AWS_ENDPOINT":"{1}","REMOTE_CACHE_URL":"{2}","TESTMO_URL":"{3}","TESTMO_PROJECT_ID":"{4}"}}', vars.AWS_BUCKET, vars.AWS_ENDPOINT, vars.REMOTE_CACHE_URL_YA, vars.TESTMO_URL, vars.TESTMO_PROJECT_ID ) }} diff --git a/.github/workflows/postcommit_relwithdebinfo.yml b/.github/workflows/postcommit_relwithdebinfo.yml index fb22ad53d6..22dc5c8974 100644 --- a/.github/workflows/postcommit_relwithdebinfo.yml +++ b/.github/workflows/postcommit_relwithdebinfo.yml @@ -33,7 +33,7 @@ jobs: test_size: "small,medium" test_threads: 52 put_build_results_to_cache: true - secs: ${{ format('{{"TESTMO_TOKEN":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', - secrets.TESTMO_TOKEN, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} + secs: ${{ format('{{"TESTMO_TOKEN2":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', + secrets.TESTMO_TOKEN2, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} vars: ${{ format('{{"AWS_BUCKET":"{0}","AWS_ENDPOINT":"{1}","REMOTE_CACHE_URL":"{2}","TESTMO_URL":"{3}","TESTMO_PROJECT_ID":"{4}"}}', vars.AWS_BUCKET, vars.AWS_ENDPOINT, vars.REMOTE_CACHE_URL_YA, vars.TESTMO_URL, vars.TESTMO_PROJECT_ID ) }}
\ No newline at end of file diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml index 84ed514f45..0449d33a8d 100644 --- a/.github/workflows/pr_check.yml +++ b/.github/workflows/pr_check.yml @@ -227,8 +227,8 @@ jobs: test_threads: 52 put_build_results_to_cache: true run_tests_if_build_fails: false - secs: ${{ format('{{"TESTMO_TOKEN":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', - secrets.TESTMO_TOKEN, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} + secs: ${{ format('{{"TESTMO_TOKEN2":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}', + secrets.TESTMO_TOKEN2, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }} vars: ${{ format('{{"AWS_BUCKET":"{0}","AWS_ENDPOINT":"{1}","REMOTE_CACHE_URL":"{2}","TESTMO_URL":"{3}","TESTMO_PROJECT_ID":"{4}"}}', vars.AWS_BUCKET, vars.AWS_ENDPOINT, vars.REMOTE_CACHE_URL_YA, vars.TESTMO_URL, vars.TESTMO_PROJECT_ID ) }} |