diff options
author | AlexSm <81806911+alexv-smirnov@users.noreply.github.com> | 2023-05-24 16:27:04 +0000 |
---|---|---|
committer | alexv-smirnov <alex@ydb.tech> | 2023-05-24 19:27:04 +0300 |
commit | 39b4a50f6cc323d60f9cee1b3e3f55e1df2dd9bd (patch) | |
tree | e68780a1b0081c32f3496234a2fa89a222925137 | |
parent | f6e4a945c2c81232e4617618228842ea39f5e262 (diff) | |
download | ydb-39b4a50f6cc323d60f9cee1b3e3f55e1df2dd9bd.tar.gz |
AWS credentials and nightly run matrix to action vars
AWS credentials and nightly run matrix to action vars
Pull Request resolved: #225
-rw-r--r-- | .github/actions/test/action.yml | 7 | ||||
-rw-r--r-- | .github/actions/test_python/action.yml | 7 | ||||
-rw-r--r-- | .github/workflows/build_and_test_ondemand.yml | 10 | ||||
-rw-r--r-- | .github/workflows/build_and_test_provisioned.yml | 8 | ||||
-rw-r--r-- | .github/workflows/nightly_run.yaml | 6 |
5 files changed, 23 insertions, 15 deletions
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index fbfa20c98e..0a3c848c84 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -25,6 +25,9 @@ inputs: aws_bucket: required: true type: string + aws_endpoint: + required: true + type: string runs: using: "composite" @@ -89,7 +92,7 @@ runs: run: | cd $WORKDIR/../build/ydb - echo "Stdout log (gzip archive): https://storage.yandexcloud.net/ydb-tech-ci/${{ github.repository }}/${{github.workflow}}/${{ github.run_id }}/${{steps.init.outputs.logfilename}}" >> $GITHUB_STEP_SUMMARY + echo "Stdout log (gzip archive): ${{inputs.aws_endpoint}}/${{inputs.aws_bucket}}/${{ github.repository }}/${{github.workflow}}/${{ github.run_id }}/${{steps.init.outputs.logfilename}}" >> $GITHUB_STEP_SUMMARY # Sed removes coloring from the output @@ -122,4 +125,4 @@ runs: aws_bucket: ${{inputs.aws_bucket}} source_dir: artifacts destination_dir: '${{ github.repository }}/${{github.workflow}}/${{ github.run_id }}' - endpoint: https://storage.yandexcloud.net + endpoint: ${{inputs.aws_endpoint}} diff --git a/.github/actions/test_python/action.yml b/.github/actions/test_python/action.yml index 353622359c..aaee7e891b 100644 --- a/.github/actions/test_python/action.yml +++ b/.github/actions/test_python/action.yml @@ -16,6 +16,9 @@ inputs: aws_bucket: required: true type: string + aws_endpoint: + required: true + type: string runs: using: "composite" @@ -29,7 +32,7 @@ runs: rm -rf ../artifacts/* source ${source_root}/ydb/tests/oss/launch/prepare.sh - echo "Stdout log (gzip archive): https://storage.yandexcloud.net/ydb-tech-ci/${{ github.repository }}/${{github.workflow}}/${{ github.run_id }}/${{inputs.log_suffix}}-${{inputs.sanitizer}}-stdout.gz" >> $GITHUB_STEP_SUMMARY + echo "Stdout log (gzip archive): https://storage.yandexcloud.net/${{inputs.aws_bucket}}/${{ github.repository }}/${{github.workflow}}/${{ github.run_id }}/${{inputs.log_suffix}}-${{inputs.sanitizer}}-stdout.gz" >> $GITHUB_STEP_SUMMARY cd ${source_root}/ydb/tests/functional/ export suite='' if [[ "${{inputs.test_label_regexp}}" != "" ]]; then @@ -49,4 +52,4 @@ runs: aws_bucket: ${{inputs.aws_bucket}} source_dir: ../artifacts destination_dir: '${{ github.repository }}/${{github.workflow}}/${{ github.run_id }}' - endpoint: https://storage.yandexcloud.net + endpoint: ${{inputs.aws_endpoint}} diff --git a/.github/workflows/build_and_test_ondemand.yml b/.github/workflows/build_and_test_ondemand.yml index 0748dc5bb0..022fa593c8 100644 --- a/.github/workflows/build_and_test_ondemand.yml +++ b/.github/workflows/build_and_test_ondemand.yml @@ -1,4 +1,4 @@ -name: Build-and-Test On-demand VM +name: Build-and-Test-On-demand on: workflow_call: @@ -36,7 +36,7 @@ on: default: true run_functional_tests: type: boolean - default: true + default: false jobs: @@ -102,7 +102,8 @@ jobs: test_label_regexp: ${{ inputs.test_label_regexp }} aws_key_id: ${{secrets.AWS_KEY_ID}} aws_key_value: ${{secrets.AWS_KEY_VALUE}} - aws_bucket: ${{secrets.AWS_BUCKET}} + aws_bucket: ${{vars.AWS_BUCKET}} + aws_endpoint: ${{vars.AWS_ENDPOINT}} testman_token: ${{secrets.TESTMO_TOKEN}} testman_url: ${{vars.TESTMO_URL}} testman_project_id: ${{vars.TESTMO_PROJECT_ID}} @@ -114,7 +115,8 @@ jobs: test_label_regexp: ${{ inputs.test_label_regexp }} aws_key_id: ${{secrets.AWS_KEY_ID}} aws_key_value: ${{secrets.AWS_KEY_VALUE}} - aws_bucket: ${{secrets.AWS_BUCKET}} + aws_bucket: ${{vars.AWS_BUCKET}} + aws_endpoint: ${{vars.AWS_ENDPOINT}} release-runner: name: Release self-hosted YC runner if provided on-demand diff --git a/.github/workflows/build_and_test_provisioned.yml b/.github/workflows/build_and_test_provisioned.yml index c156115f34..fa726a115d 100644 --- a/.github/workflows/build_and_test_provisioned.yml +++ b/.github/workflows/build_and_test_provisioned.yml @@ -1,4 +1,4 @@ -name: Build-and-Test Provisioned VM +name: Build-and-Test-Provisioned on: workflow_call: @@ -62,7 +62,8 @@ jobs: test_label_regexp: ${{ inputs.test_label_regexp }} aws_key_id: ${{secrets.AWS_KEY_ID}} aws_key_value: ${{secrets.AWS_KEY_VALUE}} - aws_bucket: ${{secrets.AWS_BUCKET}} + aws_bucket: ${{vars.AWS_BUCKET}} + aws_endpoint: ${{vars.AWS_ENDPOINT}} testman_token: ${{secrets.TESTMO_TOKEN}} testman_url: ${{vars.TESTMO_URL}} testman_project_id: ${{vars.TESTMO_PROJECT_ID}} @@ -74,5 +75,6 @@ jobs: test_label_regexp: ${{ inputs.test_label_regexp }} aws_key_id: ${{secrets.AWS_KEY_ID}} aws_key_value: ${{secrets.AWS_KEY_VALUE}} - aws_bucket: ${{secrets.AWS_BUCKET}} + aws_bucket: ${{vars.AWS_BUCKET}} + aws_endpoint: ${{vars.AWS_ENDPOINT}} diff --git a/.github/workflows/nightly_run.yaml b/.github/workflows/nightly_run.yaml index 716305a062..015b68cd05 100644 --- a/.github/workflows/nightly_run.yaml +++ b/.github/workflows/nightly_run.yaml @@ -12,8 +12,7 @@ jobs: build_ondemand: name: Build/test X64 strategy: - matrix: - sanitizer: [ "", "address", "thread" ] + matrix: ${{ fromJSON(vars.NIGHTLY_ONDEMAND_MATRIX) }} fail-fast: false uses: ./.github/workflows/build_and_test_ondemand.yml @@ -25,8 +24,7 @@ jobs: build_provisioned: name: Build/test ARM64 strategy: - matrix: - sanitizer: [ "", "address", "thread" ] + matrix: ${{ fromJSON(vars.NIGHTLY_PROVISIONED_MATRIX) }} fail-fast: false uses: ./.github/workflows/build_and_test_provisioned.yml with: |