nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Matthias Schiffer 2020-05-30 02:25:37 +02:00
parent e79124adc7
commit 430deb3a94
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/ci/jenkins-community-slave/slave.py
View File

@ -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):
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 ]