diff --git a/.github/workflows/integration-tests-core.yml b/.github/workflows/integration-tests-core.yml index a2fdff277e2..1c8c0250e51 100644 --- a/.github/workflows/integration-tests-core.yml +++ b/.github/workflows/integration-tests-core.yml @@ -43,6 +43,9 @@ on: required: false jobs: run-core-integration-tests: + permissions: + contents: write # Push allure reports to gh-pages + statuses: write # Update status on PR runs-on: ${{ inputs.os_name }} steps: - name: Check out code @@ -77,7 +80,7 @@ jobs: ACCOUNT_NAME: "" CORE_URL: ${{ steps.setup-core.outputs.service_url }} run: | - pytest -o log_cli=true -o log_cli_level=WARNING tests/integration -k "core" --alluredir=allure-results/ + pytest -o log_cli=true -o log_cli_level=WARNING tests/integration -k "core" --alluredir=allure-results/ - name: Run integration tests HTTPS env: @@ -90,35 +93,16 @@ jobs: ACCOUNT_NAME: "" CORE_URL: ${{ steps.setup-core.outputs.service_https_url }} run: | - pytest -o log_cli=true -o log_cli_level=WARNING tests/integration -k "core" --alluredir=allure-results-https/ + pytest -o log_cli=true -o log_cli_level=WARNING tests/integration -k "core" --alluredir=allure-results-https/ - # Need to pull the pages branch in order to fetch the previous runs - - name: Get Allure history - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - if: always() - continue-on-error: true - with: - ref: gh-pages - path: gh-pages - - - name: Allure Report - uses: firebolt-db/action-allure-report@781b4529b67b4f393c63d7dc1e098cb558e1ab16 # v1.4.1 - if: always() - continue-on-error: true - with: - github-key: ${{ secrets.GITHUB_TOKEN }} - test-type: core - allure-dir: allure-results - pages-branch: gh-pages - repository-name: python-sdk - - - name: Allure Report HTTPS - uses: firebolt-db/action-allure-report@781b4529b67b4f393c63d7dc1e098cb558e1ab16 # v1.4.1 + - name: Allure Reports + uses: firebolt-db/action-allure-report@084466f7dc8c9dd585d7d03825271f639ade9333 # v2.0.1 if: always() - continue-on-error: true with: - github-key: ${{ secrets.GITHUB_TOKEN }} - test-type: core_https - allure-dir: allure-results-https + github-token: ${{ github.token }} pages-branch: gh-pages - repository-name: python-sdk + mapping-json: | + { + "allure-results": "core", + "allure-results-https": "core_https" + } diff --git a/.github/workflows/integration-tests-v1.yml b/.github/workflows/integration-tests-v1.yml index aa24af70dd9..c9c1da4697e 100644 --- a/.github/workflows/integration-tests-v1.yml +++ b/.github/workflows/integration-tests-v1.yml @@ -13,6 +13,9 @@ on: required: true jobs: tests: + permissions: + contents: write # Push allure reports to gh-pages + statuses: write # Update status on PR runs-on: ubuntu-latest steps: - name: Check out code diff --git a/.github/workflows/integration-tests-v2.yml b/.github/workflows/integration-tests-v2.yml index e1d6304369a..77f35b54b63 100644 --- a/.github/workflows/integration-tests-v2.yml +++ b/.github/workflows/integration-tests-v2.yml @@ -20,6 +20,9 @@ on: jobs: tests: + permissions: + contents: write # Push allure reports to gh-pages + statuses: write # Update status on PR runs-on: ubuntu-latest steps: - name: Check out code @@ -58,23 +61,15 @@ jobs: ACCOUNT_NAME: ${{ vars.FIREBOLT_ACCOUNT }} LONG_TEST_VALUE: ${{ vars.LONG_TEST_VALUE_V2 }} run: | - pytest -n 6 --dist loadgroup --timeout_method "signal" -o log_cli=true -o log_cli_level=WARNING tests/integration -k "not V1 and not core" --runslow --alluredir=allure-results - - # Need to pull the pages branch in order to fetch the previous runs - - name: Get Allure history - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - if: always() - continue-on-error: true - with: - ref: gh-pages - path: gh-pages + pytest -n 6 --dist loadgroup --timeout_method "signal" -o log_cli=true -o log_cli_level=WARNING tests/integration -k "not V1 and not core" --runslow --alluredir=allure-results - name: Allure Report - uses: firebolt-db/action-allure-report@781b4529b67b4f393c63d7dc1e098cb558e1ab16 # v1.4.1 + uses: firebolt-db/action-allure-report@084466f7dc8c9dd585d7d03825271f639ade9333 # v2.0.1 if: always() with: - github-key: ${{ inputs.token || secrets.GITHUB_TOKEN }} - test-type: integration - allure-dir: allure-results + github-token: ${{ inputs.token || secrets.GITHUB_TOKEN }} pages-branch: gh-pages - repository-name: python-sdk + mapping-json: | + { + "allure-results": "integration_v2" + } diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 9def0df3568..b7fd7f9fb81 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -20,7 +20,8 @@ jobs: unit-tests: runs-on: ubuntu-latest permissions: - contents: write + contents: write # Push allure reports to gh-pages + statuses: write # Update status on PR steps: - name: Check out code uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 @@ -41,20 +42,16 @@ jobs: run: | pytest --cov=src/ tests/unit --cov-report=xml --alluredir=allure-results - - name: Get Allure history - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - if: always() - continue-on-error: true - with: - ref: gh-pages - path: gh-pages - - name: Allure Report - uses: firebolt-db/action-allure-report@781b4529b67b4f393c63d7dc1e098cb558e1ab16 # v1.4.1 + uses: firebolt-db/action-allure-report@084466f7dc8c9dd585d7d03825271f639ade9333 # v2.0.1 if: always() - continue-on-error: true with: - github-key: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ github.token }} + pages-branch: gh-pages + mapping-json: | + { + "allure-results": "unit" + } - name: Upload coverage report uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0