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

qa/run-standalone.sh: set PYTHONPATH for FreeBSD also #20646

Merged
merged 1 commit into from Feb 28, 2018

Conversation

tchaikov
Copy link
Contributor

do not set PYTHONPATH=/usr/lib/python2.7/dist-packages anymore, it will
be overridden later on anyway.

Signed-off-by: Kefu Chai kchai@redhat.com

do not set PYTHONPATH=/usr/lib/python2.7/dist-packages anymore, it will
be overridden later on anyway.

Signed-off-by: Kefu Chai <kchai@redhat.com>
}

if [ `uname` = FreeBSD ]; then
# otherwise module prettytable will not be found
export PYTHONPATH=/usr/local/lib/python2.7/site-packages
export PYTHONPATH=$(get_python_path):/usr/local/lib/python2.7/site-packages
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@wjwithagen FWIW, i am not trying to address the py3 support on FreeBSD, so i am leaving "python2.7" as it is.

Copy link
Contributor

Choose a reason for hiding this comment

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

@tchaikov
Oke, that is fine. This could be some trouble in the (near) future when everything starts to do python3 as preferred. Fortunately this is only executed during manual runs and as such, mostly by devs. And we will fix it there if needed. Finding Prettytable during TOX was already separately fixed in a config.
Will need a working FreeBSD-jenkins before I can test this.

@dzafman
Copy link
Contributor

dzafman commented Feb 28, 2018

@tchaikov This change is only a script run in the build tree. Doesn't require teuthology run.

@tchaikov
Copy link
Contributor Author

@dzafman i keep forgetting this. thanks for the reminder!

@tchaikov tchaikov merged commit 1932cd1 into ceph:master Feb 28, 2018
@tchaikov tchaikov deleted the wip-qa/run-standalone.sh/python-path branch March 1, 2018 01:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants