Skip to content
Snippets Groups Projects
Commit 6b3b5e70 authored by Matthias Schiffer's avatar Matthias Schiffer Committed by Martin Weinelt
Browse files

jenkins-community-slave: use requests library to download slave.jar

Do not mix two different HTTP libraries in one script. This fixes a
warning:

/var/lib/jenkins/slave.py:82: DeprecationWarning: URLopener style of invoking requests is deprecated. Use newer urlopen functions/methods

This simple implementation has the disadvantage that it stores the whole
file in RAM, but this isn't an issue for the 1.5MB slave.jar.
parent 5232428b
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,6 @@ from jenkins import Jenkins, JenkinsError, NodeLaunchMethod ...@@ -2,7 +2,6 @@ from jenkins import Jenkins, JenkinsError, NodeLaunchMethod
import os import os
import signal import signal
import sys import sys
import urllib.request
import subprocess import subprocess
import shutil import shutil
import requests import requests
...@@ -34,8 +33,9 @@ def slave_download(target): ...@@ -34,8 +33,9 @@ def slave_download(target):
if os.path.isfile(slave_jar): if os.path.isfile(slave_jar):
os.remove(slave_jar) os.remove(slave_jar)
loader = urllib.request.URLopener() r = requests.get(os.environ['JENKINS_URL'] + '/jnlpJars/slave.jar')
loader.retrieve(os.environ['JENKINS_URL'] + '/jnlpJars/slave.jar', '/var/lib/jenkins/slave.jar') with open('/var/lib/jenkins/slave.jar', 'wb') as f:
f.write(r.content)
def slave_run(slave_jar, jnlp_url): def slave_run(slave_jar, jnlp_url):
params = [ 'java', '-jar', slave_jar, '-jnlpUrl', jnlp_url ] params = [ 'java', '-jar', slave_jar, '-jnlpUrl', jnlp_url ]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment