Merge ~jdkandersson/jenkins-agent-charm:switch-to-agent-managed-jnlp-download into jenkins-agent-charm:master
Proposed by
Johann David Krister Andersson
Status: | Merged |
---|---|
Approved by: | Haw Loeung |
Approved revision: | 013b75593fc69bfb5d7d5789b3b0a0d698650968 |
Merged at revision: | 0f5d1b9c7dbaee2ecc2fec4093ca5c53b5b44b79 |
Proposed branch: | ~jdkandersson/jenkins-agent-charm:switch-to-agent-managed-jnlp-download |
Merge into: | jenkins-agent-charm:master |
Diff against target: |
233 lines (+71/-25) 8 files modified
.gitignore (+2/-0) charmcraft.yaml (+17/-0) config.yaml (+9/-0) files/download-slave.sh (+21/-9) files/jenkins-slave-systemd-config (+1/-1) reactive/jenkins_slave.py (+5/-5) templates/jenkins-slave-default (+10/-4) tests/unit/test_jenkins_slave.py (+6/-6) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Haw Loeung | +1 | Approve | |
Arturo Enrique Seijas Fernández | Approve | ||
Canonical IS Reviewers | Pending | ||
Review via email: mp+429936@code.launchpad.net |
Commit message
Use agent.jar to download jnlp file rather than download it separately
Description of the change
Newer versions of Jenkins no longer allow the downloading of the JNLP without authentication which is why the Jenkins agent machine charm fails to start up. This fix gets the agent.jar file to perform the download by passing an additional parameter to it.
To post a comment you must log in.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.