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.

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

Install setuptools #1413

Closed
wants to merge 3 commits into from
+24 −18
Closed

Install setuptools #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
560cae6
Continue jobs after failure
kajinamit Oct 3, 2024
aba4979
Switch upgrade test source to 4.5
kajinamit Oct 3, 2024
ba51fda
Install setuptools
kajinamit Oct 3, 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
9 changes: 5 additions & 4 deletions .github/workflows/gnocchi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,14 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
python:
- py39
- py311
env:
- mysql-ceph-upgrade-from-4.4
- postgresql-file-upgrade-from-4.4
- mysql-ceph-upgrade-from-4.5
- postgresql-file-upgrade-from-4.5
- mysql-file
- mysql-file-sqlalchemy14
- mysql-swift
Expand All @@ -124,13 +125,13 @@ jobs:
- postgresql-s3
- postgresql-ceph
exclude:
- env: mysql-ceph-upgrade-from-4.4
- env: mysql-ceph-upgrade-from-4.5
python: py39
- env: mysql-ceph
python: py39
- env: postgresql-ceph
python: py39
- env: mysql-ceph-upgrade-from-4.4
- env: mysql-ceph-upgrade-from-4.5
python: py311
- env: mysql-ceph
python: py311
Expand Down
18 changes: 9 additions & 9 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ queue_rules:
- check-success=doc (docs-gnocchi-web)
- check-success=check (build)
- check-success=check (pep8)
- check-success=test (py39, mysql-ceph-upgrade-from-4.4)
- check-success=test (py39, postgresql-file-upgrade-from-4.4)
- check-success=test (py39, mysql-ceph-upgrade-from-4.5)
- check-success=test (py39, postgresql-file-upgrade-from-4.5)
- check-success=test (py39, mysql-file)
- check-success=test (py39, mysql-file-sqlalchemy14)
- check-success=test (py39, mysql-swift)
Expand All @@ -17,7 +17,7 @@ queue_rules:
- check-success=test (py39, postgresql-swift)
- check-success=test (py39, postgresql-s3)
- check-success=test (py39, postgresql-ceph)
- check-success=test (py311, postgresql-file-upgrade-from-4.4)
- check-success=test (py311, postgresql-file-upgrade-from-4.5)
- check-success=test (py311, mysql-file)
- check-success=test (py311, mysql-file-sqlalchemy14)
- check-success=test (py311, mysql-swift)
Expand All @@ -40,8 +40,8 @@ pull_request_rules:
- check-success=doc (docs-gnocchi-web)
- check-success=check (build)
- check-success=check (pep8)
- check-success=test (py39, mysql-ceph-upgrade-from-4.4)
- check-success=test (py39, postgresql-file-upgrade-from-4.4)
- check-success=test (py39, mysql-ceph-upgrade-from-4.5)
- check-success=test (py39, postgresql-file-upgrade-from-4.5)
- check-success=test (py39, mysql-file)
- check-success=test (py39, mysql-file-sqlalchemy14)
- check-success=test (py39, mysql-swift)
Expand All @@ -52,7 +52,7 @@ pull_request_rules:
- check-success=test (py39, postgresql-swift)
- check-success=test (py39, postgresql-s3)
- check-success=test (py39, postgresql-ceph)
- check-success=test (py311, postgresql-file-upgrade-from-4.4)
- check-success=test (py311, postgresql-file-upgrade-from-4.5)
- check-success=test (py311, mysql-file)
- check-success=test (py311, mysql-file-sqlalchemy14)
- check-success=test (py311, mysql-swift)
Expand Down Expand Up @@ -81,10 +81,10 @@ pull_request_rules:
- actions:
backport:
branches:
- stable/4.4
- stable/4.5
conditions:
- label=backport-to-4.4
name: backport stable/4.4
- label=backport-to-4.5
name: backport stable/4.5

- actions:
backport:
Expand Down
15 changes: 10 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ passenv =
GNOCCHI_TEST_*
AWS_*
setenv =
VIRTUALENV_SETUPTOOLS=bundle
GNOCCHI_TEST_STORAGE_DRIVER=file
GNOCCHI_TEST_INDEXER_DRIVER=postgresql
GNOCCHI_TEST_STORAGE_DRIVERS=file swift ceph s3 redis
Expand Down Expand Up @@ -63,12 +64,13 @@ deps =
{[testenv]deps}
sqlalchemy<2

[testenv:{py39,py311}-postgresql-file-upgrade-from-4.4]
[testenv:{py39,py311}-postgresql-file-upgrade-from-4.5]
# We should always recreate since the script upgrade
# Gnocchi we can't reuse the virtualenv
recreate = True
setenv =
GNOCCHI_VERSION_FROM=stable/4.4
GNOCCHI_VERSION_FROM=stable/4.5
VIRTUALENV_SETUPTOOLS=bundle
GNOCCHI_VARIANT=test,postgresql,file
deps =
gnocchiclient>=2.8.0,!=7.0.7
Expand All @@ -77,12 +79,13 @@ deps =
commands = {toxinidir}/run-upgrade-tests.sh postgresql-file
allowlist_externals = {toxinidir}/run-upgrade-tests.sh

[testenv:{py39,py311}-mysql-ceph-upgrade-from-4.4]
[testenv:{py39,py311}-mysql-ceph-upgrade-from-4.5]
# We should always recreate since the script upgrade
# Gnocchi we can't reuse the virtualenv
recreate = True
setenv =
GNOCCHI_VERSION_FROM=stable/4.4
VIRTUALENV_SETUPTOOLS=bundle
GNOCCHI_VERSION_FROM=stable/4.5
GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib
deps =
gnocchiclient>=2.8.0,!=7.0.7
Expand All @@ -103,6 +106,7 @@ allowlist_externals =

[testenv:{py39,py311}-cover]
setenv =
VIRTUALENV_SETUPTOOLS=bundle
{[testenv]setenv}
PYTHON=coverage run --source gnocchi --parallel-mode
commands =
Expand Down Expand Up @@ -131,6 +135,7 @@ deps =
.[test,file,postgresql,doc]
doc8
setenv =
VIRTUALENV_SETUPTOOLS=bundle
GNOCCHI_TEST_DEBUG=1
commands =
doc8 --ignore-path doc/source/rest.rst,doc/source/comparison-table.rst doc/source
Expand All @@ -141,11 +146,11 @@ allowlist_externals =
/bin/bash
/bin/rm
setenv =
VIRTUALENV_SETUPTOOLS=bundle
GNOCCHI_STORAGE_DEPS=file
GNOCCHI_TEST_DEBUG=1
deps =
{[testenv:docs]deps}
setuptools
commands =
/bin/rm -rf doc/build/html
pifpaf -g GNOCCHI_INDEXER_URL run postgresql -- sphinx-build -W --keep-going -b html -j auto doc/source doc/build/html
Expand Down
Loading