Skip to content

Use matrix for db recorder tests #87640

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.

Sign up for GitHub

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

Merged
epenet merged 13 commits into from
Feb 8, 2023
Merged

Use matrix for db recorder tests #87640

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f9c55d7
(mock) Mark mariadb as success to skip on partial builds
epenet Feb 7, 2023
ae540bb
mariadb_groups
epenet Feb 7, 2023
a5e9422
Adjust
epenet Feb 7, 2023
31247da
Fix yaml
epenet Feb 7, 2023
5769465
mariadb-group
epenet Feb 7, 2023
3affc1f
Add postgresql-group
epenet Feb 7, 2023
2009ecd
Align
epenet Feb 7, 2023
605012f
Include mariadb-postgresql
epenet Feb 7, 2023
a6ca1c7
Merge branch 'dev' into mariadb
epenet Feb 7, 2023
e07d723
Update ci.yaml
epenet Feb 7, 2023
fed53cc
Update ci.yaml
epenet Feb 7, 2023
78c5dae
Rename jobs
epenet Feb 7, 2023
86b3eae
Remove recorder tests from coverage needs
epenet Feb 8, 2023
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
26 changes: 20 additions & 6 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ env:
HA_SHORT_VERSION: 2023.3
DEFAULT_PYTHON: "3.10"
ALL_PYTHON_VERSIONS: "['3.10']"
MARIADB_VERSIONS: "['mariadb:10.9.3']"
Copy link
Copy Markdown
Member

@bdraco bdraco Feb 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this PR but we should probably be testing with 10.6.10 since that is what ships with the addon

Copy link
Copy Markdown
Contributor Author

@epenet epenet Feb 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍
We can do that in a follow-up PR

POSTGRESQL_VERSIONS: "['postgres:15.0']"
PRE_COMMIT_CACHE: ~/.cache/pre-commit
PIP_CACHE: /tmp/pip-cache
SQLALCHEMY_WARN_20: 1
Expand All @@ -56,6 +58,8 @@ jobs:
pre-commit_cache_key: ${{ steps.generate_pre-commit_cache_key.outputs.key }}
python_cache_key: ${{ steps.generate_python_cache_key.outputs.key }}
requirements: ${{ steps.core.outputs.requirements }}
mariadb_groups: ${{ steps.info.outputs.mariadb_groups }}
postgresql_groups: ${{ steps.info.outputs.postgresql_groups }}
python_versions: ${{ steps.info.outputs.python_versions }}
test_full_suite: ${{ steps.info.outputs.test_full_suite }}
test_group_count: ${{ steps.info.outputs.test_group_count }}
Expand Down Expand Up @@ -103,6 +107,8 @@ jobs:
run: |
# Defaults
integrations_glob=""
mariadb_groups=${MARIADB_VERSIONS}
postgresql_groups=${POSTGRESQL_VERSIONS}
test_full_suite="true"
test_groups="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"
test_group_count=10
Expand Down Expand Up @@ -136,6 +142,8 @@ jobs:
tests_glob=$(echo "${tests}" | jq -cSr '. | join(",")')
[[ "${tests_glob}" == *","* ]] && tests_glob="{${tests_glob}}"

mariadb_groups="[]"
postgresql_groups="[]"
test_full_suite="false"
fi

Expand All @@ -148,12 +156,18 @@ jobs:
|| [[ "${{ github.event.inputs.full }}" == "true" ]] \
|| [[ "${{ contains(github.event.pull_request.labels.*.name, 'ci-full-run') }}" == "true" ]];
then
mariadb_groups=${MARIADB_VERSIONS}
postgresql_groups=${POSTGRESQL_VERSIONS}
test_groups="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"
test_group_count=10
test_full_suite="true"
fi

# Output & sent to GitHub Actions
echo "mariadb_groups: ${mariadb_groups}"
echo "mariadb_groups=${mariadb_groups}" >> $GITHUB_OUTPUT
echo "postgresql_groups: ${postgresql_groups}"
echo "postgresql_groups=${postgresql_groups}" >> $GITHUB_OUTPUT
echo "python_versions: ${ALL_PYTHON_VERSIONS}"
echo "python_versions=${ALL_PYTHON_VERSIONS}" >> $GITHUB_OUTPUT
echo "test_full_suite: ${test_full_suite}"
Expand Down Expand Up @@ -909,7 +923,7 @@ jobs:
runs-on: ubuntu-20.04
services:
mariadb:
image: mariadb:10.9.3
image: ${{ matrix.mariadb-group }}
ports:
- 3306:3306
env:
Expand All @@ -920,7 +934,6 @@ jobs:
&& github.event.inputs.lint-only != 'true'
&& github.event.inputs.pylint-only != 'true'
&& github.event.inputs.mypy-only != 'true'
&& needs.info.outputs.test_full_suite == 'true'
needs:
- info
- base
Expand All @@ -935,8 +948,9 @@ jobs:
fail-fast: false
matrix:
python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
mariadb-group: ${{ fromJson(needs.info.outputs.mariadb_groups) }}
name: >-
Run tests Python ${{ matrix.python-version }} (mariadb)
Run recorder tests Python ${{ matrix.python-version }} (${{ matrix.mariadb-group }})
steps:
- name: Install additional OS dependencies
run: |
Expand Down Expand Up @@ -1010,7 +1024,7 @@ jobs:
runs-on: ubuntu-20.04
services:
postgres:
image: postgres:15.0
image: ${{ matrix.postgresql-group }}
ports:
- 5432:5432
env:
Expand All @@ -1019,7 +1033,6 @@ jobs:
if: |
(github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
&& github.event.inputs.lint-only != 'true'
&& needs.info.outputs.test_full_suite == 'true'
&& github.event.inputs.pylint-only != 'true'
&& github.event.inputs.mypy-only != 'true'
needs:
Expand All @@ -1035,8 +1048,9 @@ jobs:
fail-fast: false
matrix:
python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
postgresql-group: ${{ fromJson(needs.info.outputs.postgresql_groups) }}
name: >-
Run tests Python ${{ matrix.python-version }} (postgresql)
Run recorder tests Python ${{ matrix.python-version }} (${{ matrix.postgresql-group }})
steps:
- name: Install additional OS dependencies
run: |
Expand Down