Merge "Silence zuul_swift_upload"
This commit is contained in:
commit
51ec23046a
@ -27,6 +27,7 @@ import os
|
||||
import Queue
|
||||
import requests
|
||||
import requests.exceptions
|
||||
import requestsexceptions
|
||||
import stat
|
||||
import sys
|
||||
import tempfile
|
||||
@ -450,6 +451,10 @@ def grab_args():
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
# Avoid unactionable warnings
|
||||
requestsexceptions.squelch_warnings(requestsexceptions.InsecureRequestWarning)
|
||||
|
||||
args = grab_args()
|
||||
# file_list: A list of files to push to swift (in file_detail format)
|
||||
file_list = []
|
||||
|
@ -23,4 +23,4 @@ set -e
|
||||
# https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
|
||||
sudo -H virtualenv /usr/zuul-swift-logs-env
|
||||
sudo -H /usr/zuul-swift-logs-env/bin/pip install python-magic argparse \
|
||||
requests glob2
|
||||
requests glob2 requestsexceptions
|
||||
|
@ -232,7 +232,7 @@ sudo rm -fr /tmp/zuul
|
||||
# https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
|
||||
sudo -H virtualenv /usr/zuul-swift-logs-env
|
||||
sudo -H /usr/zuul-swift-logs-env/bin/pip install python-magic argparse \
|
||||
requests glob2
|
||||
requests glob2 requestsexceptions
|
||||
|
||||
# Create a virtualenv for os-testr (which contains subunit2html)
|
||||
# this is in /usr instead of /usr/loca/ due to this bug on precise:
|
||||
|
Loading…
x
Reference in New Issue
Block a user