Skip to content

Commit ae89a5e

Browse files
committed
ci: support multiple allure reports
1 parent c3d0fd7 commit ae89a5e

2 files changed

Lines changed: 18 additions & 45 deletions

File tree

.github/workflows/integration-tests-core.yml

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
ACCOUNT_NAME: ""
7878
CORE_URL: ${{ steps.setup-core.outputs.service_url }}
7979
run: |
80-
pytest -o log_cli=true -o log_cli_level=WARNING tests/integration -k "core" --alluredir=allure-results/
80+
pytest -o log_cli=true -o log_cli_level=WARNING tests/integration -k "core" --alluredir=allure-results/
8181
8282
- name: Run integration tests HTTPS
8383
env:
@@ -90,35 +90,16 @@ jobs:
9090
ACCOUNT_NAME: ""
9191
CORE_URL: ${{ steps.setup-core.outputs.service_https_url }}
9292
run: |
93-
pytest -o log_cli=true -o log_cli_level=WARNING tests/integration -k "core" --alluredir=allure-results-https/
93+
pytest -o log_cli=true -o log_cli_level=WARNING tests/integration -k "core" --alluredir=allure-results-https/
9494
95-
# Need to pull the pages branch in order to fetch the previous runs
96-
- name: Get Allure history
97-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
98-
if: always()
99-
continue-on-error: true
100-
with:
101-
ref: gh-pages
102-
path: gh-pages
103-
104-
- name: Allure Report
105-
uses: firebolt-db/action-allure-report@781b4529b67b4f393c63d7dc1e098cb558e1ab16 # v1.4.1
106-
if: always()
107-
continue-on-error: true
108-
with:
109-
github-key: ${{ secrets.GITHUB_TOKEN }}
110-
test-type: core
111-
allure-dir: allure-results
112-
pages-branch: gh-pages
113-
repository-name: python-sdk
114-
115-
- name: Allure Report HTTPS
116-
uses: firebolt-db/action-allure-report@781b4529b67b4f393c63d7dc1e098cb558e1ab16 # v1.4.1
95+
- name: Allure Reports
96+
uses: firebolt-db/action-allure-report@891ff9e619a844dd484106b94aaf4aae4c5c87e2 # v2.0.0
11797
if: always()
118-
continue-on-error: true
11998
with:
120-
github-key: ${{ secrets.GITHUB_TOKEN }}
121-
test-type: core_https
122-
allure-dir: allure-results-https
99+
github-token: ${{ github.token }}
123100
pages-branch: gh-pages
124-
repository-name: python-sdk
101+
mapping-json: |
102+
{
103+
"allure-results": "core",
104+
"allure-results-https": "core_https"
105+
}

.github/workflows/integration-tests-v2.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,15 @@ jobs:
5858
ACCOUNT_NAME: ${{ vars.FIREBOLT_ACCOUNT }}
5959
LONG_TEST_VALUE: ${{ vars.LONG_TEST_VALUE_V2 }}
6060
run: |
61-
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
61+
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
6262
63-
# Need to pull the pages branch in order to fetch the previous runs
64-
- name: Get Allure history
65-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
66-
if: always()
67-
continue-on-error: true
68-
with:
69-
ref: gh-pages
70-
path: gh-pages
71-
72-
- name: Allure Report
73-
uses: firebolt-db/action-allure-report@781b4529b67b4f393c63d7dc1e098cb558e1ab16 # v1.4.1
63+
- name: Allure Reports
64+
uses: firebolt-db/action-allure-report@891ff9e619a844dd484106b94aaf4aae4c5c87e2 # v2.0.0
7465
if: always()
7566
with:
76-
github-key: ${{ inputs.token || secrets.GITHUB_TOKEN }}
77-
test-type: integration
78-
allure-dir: allure-results
67+
github-token: ${{ inputs.token || secrets.GITHUB_TOKEN }}
7968
pages-branch: gh-pages
80-
repository-name: python-sdk
69+
mapping-json: |
70+
{
71+
"allure-results": "integration_v2",
72+
}

0 commit comments

Comments
 (0)