openstack/project-config
Code Issues Proposed changes

Merge "Silence zuul_swift_upload"

Browse Source
This commit is contained in:
Jenkins
2016-04-05 15:03:17 +00:00
committed by Gerrit Code Review
parent 2e82d13cb1 84e76e3f72
commit 51ec23046a
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins/scripts/zuul_swift_upload.py
View File

@@ -27,6 +27,7 @@ import os
import Queue import Queue
import requests import requests
import requests.exceptions import requests.exceptions
import requestsexceptions
import stat import stat
import sys import sys
import tempfile import tempfile
@@ -450,6 +451,10 @@ def grab_args():
if __name__ == '__main__': if __name__ == '__main__':
# Avoid unactionable warnings
requestsexceptions.squelch_warnings(requestsexceptions.InsecureRequestWarning)
args = grab_args() args = grab_args()
# file_list: A list of files to push to swift (in file_detail format) # file_list: A list of files to push to swift (in file_detail format)
file_list = [] file_list = []

2
nodepool/elements/nodepool-base/install.d/90-venv-swift-logs
View File

@@ -23,4 +23,4 @@ set -e
# https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588 # https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
sudo -H virtualenv /usr/zuul-swift-logs-env sudo -H virtualenv /usr/zuul-swift-logs-env
sudo -H /usr/zuul-swift-logs-env/bin/pip install python-magic argparse \ sudo -H /usr/zuul-swift-logs-env/bin/pip install python-magic argparse \
requests glob2 requests glob2 requestsexceptions

2
nodepool/scripts/prepare_node.sh
View File

@@ -232,7 +232,7 @@ sudo rm -fr /tmp/zuul
# https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588 # https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
sudo -H virtualenv /usr/zuul-swift-logs-env sudo -H virtualenv /usr/zuul-swift-logs-env
sudo -H /usr/zuul-swift-logs-env/bin/pip install python-magic argparse \ 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) # Create a virtualenv for os-testr (which contains subunit2html)
# this is in /usr instead of /usr/loca/ due to this bug on precise: # this is in /usr instead of /usr/loca/ due to this bug on precise: