mirror of https://github.com/axmolengine/axmol.git
Merge pull request #6940 from lmskater/fix-proxy
[Jenkins][ci skip] Fix proxy address to jenkins config
This commit is contained in:
commit
50fc1e23c5
|
@ -8,6 +8,8 @@ import sys
|
|||
import traceback
|
||||
import urllib2
|
||||
|
||||
http_proxy = ''
|
||||
if(os.environ.has_key('HTTP_PROXY')):
|
||||
http_proxy = os.environ['HTTP_PROXY']
|
||||
proxyDict = {'http':http_proxy,'https':http_proxy}
|
||||
|
||||
|
|
|
@ -8,6 +8,8 @@ import sys
|
|||
import traceback
|
||||
from jenkinsapi.jenkins import Jenkins
|
||||
|
||||
http_proxy = ''
|
||||
if(os.environ.has_key('HTTP_PROXY')):
|
||||
http_proxy = os.environ['HTTP_PROXY']
|
||||
proxyDict = {'http':http_proxy,'https':http_proxy}
|
||||
|
||||
|
|
|
@ -5,7 +5,9 @@ import jenkinsapi
|
|||
from jenkinsapi.jenkins import Jenkins
|
||||
from jenkinsapi.constants import STATUS_SUCCESS
|
||||
|
||||
payload_str = os.environ['payload']
|
||||
http_proxy = ''
|
||||
if(os.environ.has_key('HTTP_PROXY')):
|
||||
http_proxy = os.environ['HTTP_PROXY']
|
||||
payload_str = payload_str.decode('utf-8','ignore')
|
||||
#parse to json obj
|
||||
payload = json.loads(payload_str)
|
||||
|
|
|
@ -61,6 +61,8 @@ def check_current_3rd_libs(branch):
|
|||
current_file = current_files[i]
|
||||
copy(current_file, backup_file)
|
||||
|
||||
http_proxy = ''
|
||||
if(os.environ.has_key('HTTP_PROXY')):
|
||||
http_proxy = os.environ['HTTP_PROXY']
|
||||
proxyDict = {'http':http_proxy,'https':http_proxy}
|
||||
def main():
|
||||
|
|
Loading…
Reference in New Issue