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

mimic: qa/ceph-disk: use a Python2.7 compatible version of pytest #31254

Merged
merged 1 commit into from Oct 31, 2019

Conversation

@alfredodeza
Copy link
Contributor

alfredodeza commented Oct 30, 2019

The script was installing the latest pytest which no longer supports Python 2.7, this change uses the documented release that supports the version that ceph-disk uses.

See: https://docs.pytest.org/en/latest/py27-py34-deprecation.html

Fixes: https://tracker.ceph.com/issues/42292

@alfredodeza alfredodeza added this to the mimic milestone Oct 30, 2019
@alfredodeza alfredodeza requested review from tchaikov, yuriw and smithfarm Oct 30, 2019
Copy link
Contributor

smithfarm left a comment

Please re-do the cherry-pick using git cherry-pick -x

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Oct 30, 2019

@alfredodeza I'm assuming this is a cherry-pick from your luminous fix which was just merged today. (You might also note in the commit message that the commit is cherry-picked from luminous, since under normal circumstances the assumption is that (cherry picked from commit [SHA1]) refers to a SHA1 in the master branch.)

@smithfarm smithfarm added the tools label Oct 30, 2019
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 149ce7a)
@alfredodeza alfredodeza force-pushed the alfredodeza:wip-rm42292-mimic branch from 40df472 to 0ed47f4 Oct 30, 2019
@alfredodeza

This comment has been minimized.

Copy link
Contributor Author

alfredodeza commented Oct 30, 2019

I've done a cherry-pick -x to fix the commit.

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 30, 2019

@yuriw
yuriw approved these changes Oct 30, 2019
Copy link
Contributor

yuriw left a comment

👍

@yuriw yuriw requested a review from smithfarm Oct 30, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 30, 2019

@smithfarm pls review, it passed tests

@yuriw yuriw merged commit e7e5cf1 into ceph:mimic Oct 31, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.