Skip to content

Commit

Permalink
Revert "Use custom pifpaf"
Browse files Browse the repository at this point in the history
The 3.2.2 release of pifpaf includes the
Ceph fix that we need.

This reverts commit a537a58.
  • Loading branch information
tobias-urdin committed Oct 10, 2024
1 parent 8498c02 commit 9fd6633
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ setenv =
deps =
.[test,redis,prometheus,amqp1,{env:GNOCCHI_STORAGE_DEPS:},{env:GNOCCHI_INDEXER_DEPS:}]
{env:GNOCCHI_TEST_TARBALLS:}
# TODO(tobias-urdin): Remove when Ubuntu doesn't have a mangled Ceph version.
git+https://github.com/tobias-urdin/pifpaf@2d0890b7efb7af50172a95e5065a51d7871e8a76
cliff!=2.9.0
gnocchiclient>=2.8.0,!=7.0.7
commands =
Expand All @@ -75,9 +73,8 @@ setenv =
GNOCCHI_VERSION_FROM=stable/4.5
GNOCCHI_VARIANT=test,postgresql,file
deps =
# TODO(tobias-urdin): Remove when Ubuntu doesn't have a mangled Ceph version.
git+https://github.com/tobias-urdin/pifpaf@2d0890b7efb7af50172a95e5065a51d7871e8a76
gnocchiclient>=2.8.0,!=7.0.7
pifpaf
xattr!=0.9.4
commands = {toxinidir}/run-upgrade-tests.sh postgresql-file
allowlist_externals = {toxinidir}/run-upgrade-tests.sh
Expand All @@ -91,9 +88,8 @@ setenv =
GNOCCHI_VERSION_FROM=stable/4.5
GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib
deps =
# TODO(tobias-urdin): Remove when Ubuntu doesn't have a mangled Ceph version.
git+https://github.com/tobias-urdin/pifpaf@2d0890b7efb7af50172a95e5065a51d7871e8a76
gnocchiclient>=2.8.0,!=7.0.7
pifpaf[ceph]
xattr!=0.9.4
commands = {toxinidir}/run-upgrade-tests.sh mysql-ceph
allowlist_externals = {toxinidir}/run-upgrade-tests.sh
Expand Down

0 comments on commit 9fd6633

Please sign in to comment.