Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setting up allure for integration tests #491

Merged
merged 54 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
e6a8cea
First draft
swetha1654 Dec 2, 2024
849d974
Merge branch 'main' into ISD-2620-allure
swetha1654 Dec 2, 2024
c39ab8b
Edits
swetha1654 Dec 2, 2024
b2208a0
upload allure results
swetha1654 Dec 4, 2024
b9ad38a
added allure-pytest
swetha1654 Dec 4, 2024
9d26d45
debug lines
swetha1654 Dec 4, 2024
4f456bc
debug lines
swetha1654 Dec 4, 2024
399c7dc
debug lines
swetha1654 Dec 4, 2024
5904407
debug lines
swetha1654 Dec 4, 2024
7434888
debug lines
swetha1654 Dec 4, 2024
facf0c1
getting integ to run
swetha1654 Dec 4, 2024
76b8b13
getting integ to run
swetha1654 Dec 4, 2024
fe89621
getting integ to run
swetha1654 Dec 5, 2024
f7c81be
getting integ to run
swetha1654 Dec 5, 2024
06ae0c6
getting integ to run
swetha1654 Dec 5, 2024
b46d2be
getting integ to run
swetha1654 Dec 5, 2024
0c6c4c9
getting integ to run
swetha1654 Dec 5, 2024
cba2819
getting integ to run
swetha1654 Dec 5, 2024
fec66c7
adding default result
swetha1654 Dec 6, 2024
a8f2e7c
adding default result
swetha1654 Dec 6, 2024
bd05b70
adding default result
swetha1654 Dec 6, 2024
72aec57
adding default result
swetha1654 Dec 6, 2024
bb9a889
adding default result
swetha1654 Dec 6, 2024
4ddf4a2
adding default result
swetha1654 Dec 9, 2024
9726ee0
adding default result
swetha1654 Dec 9, 2024
ee58e40
adding default result
swetha1654 Dec 9, 2024
cbc8ace
adding default result
swetha1654 Dec 9, 2024
e31c150
adding default result
swetha1654 Dec 9, 2024
cb3a9cc
adding default result
swetha1654 Dec 9, 2024
8da2658
adding default result
swetha1654 Dec 9, 2024
3baff1f
adding default result
swetha1654 Dec 9, 2024
d7eee35
adding default result
swetha1654 Dec 9, 2024
c691921
adding default result
swetha1654 Dec 9, 2024
b2ef7ae
testing operator workflows
swetha1654 Dec 9, 2024
ba02d19
testing
swetha1654 Dec 10, 2024
08e2a7d
testing #
swetha1654 Dec 10, 2024
3bf15ca
testing
swetha1654 Dec 10, 2024
b3c486a
testing
swetha1654 Dec 10, 2024
177f6f4
testing
swetha1654 Dec 10, 2024
53e0331
Update integration_test_allure.md
swetha1654 Dec 10, 2024
5d1b21c
Merge branch 'main' into ISD-2620-allure
swetha1654 Dec 10, 2024
d8b4254
remove python folder
swetha1654 Dec 10, 2024
4c74d54
address review comments
swetha1654 Dec 10, 2024
163d735
address review comments
swetha1654 Dec 11, 2024
b285aaf
address review comments
swetha1654 Dec 11, 2024
aeac64b
address review comments
swetha1654 Dec 11, 2024
1fde840
update tox and add check allure
swetha1654 Dec 11, 2024
a0da652
update tox and add check allure
swetha1654 Dec 11, 2024
4202ba7
update tox and add check allure
swetha1654 Dec 11, 2024
cb41e52
update tox and add check allure
swetha1654 Dec 11, 2024
89c33f4
update tox and add check allure
swetha1654 Dec 11, 2024
90c4f66
test
swetha1654 Dec 11, 2024
27f038a
test
swetha1654 Dec 11, 2024
d4b0c25
test
swetha1654 Dec 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 98 additions & 0 deletions .github/workflows/allure_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# Copyright 2024 Canonical Ltd.
# See LICENSE file for licensing details.

name: Allure Report Generation
swetha1654 marked this conversation as resolved.
Show resolved Hide resolved

on: [workflow_call]

jobs:
allure-report:
name: Publish Allure report
runs-on: ubuntu-latest
timeout-minutes: 5
yanksyoon marked this conversation as resolved.
Show resolved Hide resolved
if: always() && !cancelled()
steps:
- name: Download Allure
# Following instructions from https://allurereport.org/docs/install-for-linux/#install-from-a-deb-package
run: gh release download --repo allure-framework/allure2 --pattern 'allure_*.deb'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Install Allure
run: |
sudo apt-get update
sudo apt-get install ./allure_*.deb -y
- name: Checkout GitHub pages branch
uses: actions/checkout@v4
with:
ref: gh-pages
path: repo/
# The `gh-pages` branch is used to host the Allure report site.
# With every workflow run, the workflow creates a new folder with the run_number and stores the test results there
- name: Download fallback test results
uses: actions/download-artifact@v4
with:
path: allure-collection-fallback-results/
pattern: allure-fallback-results*
merge-multiple: true
- name: Download actual test results
uses: actions/download-artifact@v4
with:
path: allure-results/
pattern: allure-results*
merge-multiple: true
- name: Install CLI
run: pipx install git+https://github.com/canonical/[email protected]#subdirectory=python/cli
- name: Combine Allure fallback results & actual results
# For every test: if actual result available, use that. Otherwise, use fallback result
# So that, if actual result not available, Allure report will show "unknown"/"failed" test result
# instead of omitting the test
run: allure-add-default-for-missing-results --allure-results-dir=allure-results --allure-collection-default-results-dir=allure-collection-fallback-results
- name: Load test report history
run: |
if [[ -d repo/_latest/history/ ]]
then
echo 'Loading history'
cp -r repo/_latest/history/ allure-results/
fi
- name: Create executor.json
shell: python
run: |
# Reverse engineered from https://github.com/simple-elf/allure-report-action/blob/eca283b643d577c69b8e4f048dd6cd8eb8457cfd/entrypoint.sh
swetha1654 marked this conversation as resolved.
Show resolved Hide resolved
import json

DATA = {
"name": "GitHub Actions",
"type": "github",
"buildOrder": ${{ github.run_number }}, # TODO future improvement: use run ID
"buildName": "Run ${{ github.run_id }}",
"buildUrl": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
"reportUrl": "../${{ github.run_number }}/",
}
with open("allure-results/executor.json", "w") as file:
json.dump(DATA, file)
- name: Generate Allure report
run: allure generate
- name: Create index.html
shell: python
run: |
DATA = f"""<!DOCTYPE html>
yanksyoon marked this conversation as resolved.
Show resolved Hide resolved
<meta charset="utf-8">
<meta http-equiv="cache-control" content="no-cache">
<meta http-equiv="refresh" content="0; url=${{ github.run_number }}">
"""
with open("repo/index.html", "w") as file:
file.write(DATA)
- name: Update GitHub pages branch
working-directory: repo/
run: |
mkdir '${{ github.run_number }}'
rm -f _latest
ln -s '${{ github.run_number }}' _latest
yanksyoon marked this conversation as resolved.
Show resolved Hide resolved
cp -r ../allure-report/. _latest/
git add .
git config user.name "GitHub Actions"
# user.email obtained from https://github.com/actions/checkout/issues/13#issuecomment-724415212
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git commit -m "Allure report ${{ github.run_number }}"
# Uses token set in checkout step
git push origin gh-pages
55 changes: 40 additions & 15 deletions .github/workflows/integration_test_run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,36 @@ jobs:
)) || inputs.runs-on
}}
steps:
- uses: actions/[email protected]
- name: Integration tests variable setting
run: |
allure_artifact_suffix=$(uuidgen)
series=""
if [ ! -z ${{ matrix.series }} ]; then
series="--series ${{ matrix.series }}"
allure_artifact_suffix="$allure_artifact_suffix"-${{ matrix.series }}
fi
echo "SERIES=$series" >> $GITHUB_ENV
module=""
if [ ! -z ${{ matrix.modules }} ]; then
module="-k ${{ matrix.modules }}"
allure_artifact_suffix="$allure_artifact_suffix"-${{ matrix.modules }}
fi
echo "MODULE=$module" >> $GITHUB_ENV
echo "ALLURE_ARTIFACT_SUFFIX=$allure_artifact_suffix" >> $GITHUB_ENV
- name: Install tox
run: |
pip install tox
- name: Collect tests for Allure
swetha1654 marked this conversation as resolved.
Show resolved Hide resolved
working-directory: ${{ inputs.working-directory }}
run: |
tox -e ${{ inputs.test-tox-env }} -- --keep-models ${{ env.SERIES }} ${{ env.MODULE }} --allure-collection-dir=allure-default ${{ inputs.extra-arguments }} ${{ secrets.INTEGRATION_TEST_ARGS }}
- name: Upload Default Allure results
timeout-minutes: 3
uses: actions/upload-artifact@v4
with:
name: allure-fallback-results-${{ env.ALLURE_ARTIFACT_SUFFIX }}
path: ${{ inputs.working-directory }}allure-default/
- name: Setup operator environment
uses: charmed-kubernetes/actions-operator@main
with:
Expand Down Expand Up @@ -266,14 +296,12 @@ jobs:
VAULT_APPROLE_SECRET_ID: ${{ secrets.VAULT_APPROLE_SECRET_ID }}

- run: sudo apt install skopeo -y

- name: Plan Integration
uses: canonical/operator-workflows/internal/plan-integration@main
id: plan-integration
with:
plan: ${{ inputs.plan }}

- name: Integration tests variable setting
- name: Charm name setting
working-directory: ${{ inputs.working-directory }}/${{ inputs.charm-directory }}
run: |
CHARM_NAME="$([ -f metadata.yaml ] && yq '.name' metadata.yaml || echo UNKNOWN)"
Expand All @@ -284,26 +312,23 @@ jobs:

args="${{ steps.plan-integration.outputs.args }}"
echo "ARGS=$args" >> $GITHUB_ENV
series=""
if [ ! -z ${{ matrix.series }} ]; then
series="--series ${{ matrix.series }}"
fi
echo "SERIES=$series" >> $GITHUB_ENV
module=""
if [ ! -z ${{ matrix.modules }} ]; then
module="-k ${{ matrix.modules }}"
fi
echo "MODULE=$module" >> $GITHUB_ENV
swetha1654 marked this conversation as resolved.
Show resolved Hide resolved
- name: Run k8s integration tests
working-directory: ${{ inputs.working-directory }}
if: ${{ inputs.provider == 'microk8s' }}
run: |
tox -e ${{ inputs.test-tox-env }} -- --model testing --keep-models ${{ env.SERIES }} ${{ env.MODULE }} ${{ env.ARGS }} ${{ inputs.extra-arguments }} ${{ secrets.INTEGRATION_TEST_ARGS }}
tox -e ${{ inputs.test-tox-env }} -- --model testing --keep-models ${{ env.SERIES }} ${{ env.MODULE }} ${{ env.ARGS }} --alluredir=allure-results ${{ inputs.extra-arguments }} ${{ secrets.INTEGRATION_TEST_ARGS }}
- name: Run lxd integration tests
working-directory: ${{ inputs.working-directory }}
if: ${{ inputs.provider == 'lxd' }}
run: |
tox -e ${{ inputs.test-tox-env }} -- --keep-models ${{ env.SERIES }} ${{ env.MODULE }} ${{ env.ARGS }} ${{ inputs.extra-arguments }} ${{ secrets.INTEGRATION_TEST_ARGS }}
tox -e ${{ inputs.test-tox-env }} -- --keep-models ${{ env.SERIES }} ${{ env.MODULE }} ${{ env.ARGS }} --alluredir=allure-results ${{ inputs.extra-arguments }} ${{ secrets.INTEGRATION_TEST_ARGS }}
- name: Upload Allure results
timeout-minutes: 3
if: always() && !cancelled()
uses: actions/upload-artifact@v4
with:
name: allure-results-${{ env.ALLURE_ARTIFACT_SUFFIX }}
path: ${{ inputs.working-directory }}allure-results/
- name: Tmate debugging session (self-hosted)
if: ${{ failure() && (inputs.tmate-debug || runner.debug) && inputs.self-hosted-runner }}
uses: canonical/action-tmate@main
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/workflow_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ jobs:
integration-test-workflow-file: workflow_test.yaml
working-directory: tests/workflows/integration/test-upload-charm/
workflow-run-id: ${{ github.run_id }}
allure-report:
if: always() && !cancelled()
needs:
- integration
- integration-juju3
- integration-artifact
- integration-self-hosted
uses: ./.github/workflows/allure_report.yaml
check:
runs-on: ubuntu-latest
if: always() && !cancelled()
Expand All @@ -119,6 +127,7 @@ jobs:
- integration-craft
- publish
- publish-artifact
- allure-report
steps:
- run: |
[ '${{ needs.simple.result }}' = 'success' ] || (echo simple failed && false)
Expand All @@ -132,3 +141,5 @@ jobs:
[ '${{ needs.integration-craft.result }}' = 'success' ] || (echo integration-craft failed && false)
[ '${{ needs.publish.result }}' != 'failure' ] || (echo publish failed && false)
[ '${{ needs.publish-artifact.result }}' != 'failure' ] || (echo publish failed && false)
[ '${{ needs.allure-report.result }}' != 'failure' ] || (echo allure-report failed && false)

62 changes: 62 additions & 0 deletions docs/how-to/integration_test_allure.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# How to set up Allure Reports for integration tests

This how-to guide describes how to integrate [Allure Reports](https://allurereport.org/) into your code repository's [integration_test_run.yaml](https://github.com/canonical/operator-workflows?tab=readme-ov-file#integration-test-workflow-canonicaloperator-workflowsgithubworkflowsintegration_testyamlmain).

## Adding allure-pytest and pytest collection plugin

Include the following snippet in the `requirements.txt` that is called by the integration test:

```
allure-pytest>=2.8.18
```

Add the following line under the dependencies (`deps`) in the integration section inside `tox.ini`:

```

Check warning on line 15 in docs/how-to/integration_test_allure.md

View workflow job for this annotation

GitHub Actions / simple / Style checker

[vale] reported by reviewdog 🐶 [Canonical.016-No-inline-comments] Avoid inline comments in code blocks. Raw Output: {"message": "[Canonical.016-No-inline-comments] Avoid inline comments in code blocks.", "location": {"path": "docs/how-to/integration_test_allure.md", "range": {"start": {"line": 15, "column": 1}}}, "severity": "WARNING"}

Check warning on line 15 in docs/how-to/integration_test_allure.md

View workflow job for this annotation

GitHub Actions / simple-self-hosted / Style checker

[vale] reported by reviewdog 🐶 [Canonical.016-No-inline-comments] Avoid inline comments in code blocks. Raw Output: {"message": "[Canonical.016-No-inline-comments] Avoid inline comments in code blocks.", "location": {"path": "docs/how-to/integration_test_allure.md", "range": {"start": {"line": 15, "column": 1}}}, "severity": "WARNING"}
git+https://github.com/canonical/operator-workflows@main\#subdirectory=python/pytest_plugins/allure_pytest_collection_report
```

## Calling the allure-workflow

To call the reusable workflow [allure_report.yaml](https://github.com/canonical/operator-workflows/blob/main/.github/workflows/allure_report.yaml), add the following lines at the end of the workflow that runs the integrations tests:

```
allure-report:
if: always() && !cancelled()
needs:
- [list of jobs that calls integration_test workflow whose tests you would like to visualize]
uses: canonical/operator-workflows/.github/workflows/allure_report.yaml@main
```

For an example of this implementation, see [the GitHub runner repository](https://github.com/canonical/github-runner-operator/pull/412).

**NOTE:** If the workflow is being called inside a matrix with the same test modules run with different parameters, the Allure Report will only display the results of the last combination.

## Changing branch permissions

**NOTE:** For this step, you need admin access to the repository.

- Go to the repository's **Settings > Branches** and next to Branch protection rules, select **Add rule**
- Enter the branch name **gh-pages** and click **Save changes** (Ensure that "require signed commits" is unchecked)

## Github pages branch

- Create `gh-pages` branch:

```
# For first run, manually create branch with no history
# (e.g.
# git checkout --orphan gh-pages
# git rm -rf .
# touch .nojekyll
# git add .nojekyll
# git commit -m "Initial commit"
# git push origin gh-pages
# )
```

- Enable GitHub pages publishing at ** Settings > Pages ** and set branch name as `gh-pages`:

<img width="816" alt="image" src="https://github.com/user-attachments/assets/346c04fc-0daa-40bc-92b5-93b0ea639f94">

For an example of the first two steps, see [the GitHub runner repository](https://github.com/canonical/github-runner-operator/pull/412).
1 change: 1 addition & 0 deletions tests/workflows/integration/test-rock/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ops
allure-pytest>=2.8.18
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ops >= 1.5.0
allure-pytest>=2.8.18
2 changes: 2 additions & 0 deletions tests/workflows/integration/test-upload-charm/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ deps =
macaroonbakery==1.3.2
websockets<14.0 # https://github.com/juju/python-libjuju/issues/1184
-r{toxinidir}/requirements.txt
git+https://github.com/canonical/[email protected]\#subdirectory=python/pytest_plugins/allure_pytest_collection_report
commands =
pytest -v --tb native --ignore={[vars]tst_path}unit --log-cli-level=INFO -s {posargs}

Expand All @@ -126,5 +127,6 @@ deps =
macaroonbakery==1.3.2
websockets<14.0 # https://github.com/juju/python-libjuju/issues/1184
-r{toxinidir}/requirements.txt
git+https://github.com/canonical/[email protected]\#subdirectory=python/pytest_plugins/allure_pytest_collection_report
commands =
pytest -v --tb native --ignore={[vars]tst_path}unit --log-cli-level=INFO -s {posargs}
Loading