Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace worker template by a more flexible approach #82

Merged
merged 12 commits into from
Oct 26, 2021
Merged

replace worker template by a more flexible approach #82

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
827b95e
replace all job related form fields by a job template
Sep 6, 2021
698e123
fix malformed HTML
Sep 6, 2021
cf06c76
refactoring
Sep 6, 2021
2a8fa1b
fix NPE
Sep 6, 2021
1f184fd
fix spotbugs finding
Oct 20, 2021
d004220
remove unnecessary declaration
Oct 20, 2021
1a610a0
refactoring
Oct 20, 2021
45466ad
improve documentation
j3t Oct 20, 2021
a4a1c1b
mark deprecated fields as such
multani Oct 21, 2021
25a1f0d
mark old template classes as deprecated
Oct 21, 2021
fa82658
log migration process
Oct 21, 2021
2540039
add validation possibility for job file
Oct 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactoring
  • Loading branch information
Jens Thielscher committed Oct 20, 2021
commit 1a610a00cae5b620a9e0aa95433194b3535ebf08
6 changes: 1 addition & 5 deletions src/main/java/org/jenkinsci/plugins/nomad/MigrationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,12 @@ private static void migrateJobTemplate(NomadWorkerTemplate template, String jenk
String jobTemplate = getFieldValue(template, "jobTemplate");

if (StringUtils.isEmpty(jobTemplate)) {
j3t marked this conversation as resolved.
Show resolved Hide resolved
jobTemplate = createJobTemplate(template, jenkinsUrl, jenkinsTunnel, workerUrl);
jobTemplate = buildWorkerJob("%WORKER_NAME%", "%WORKER_SECRET%", jenkinsUrl, jenkinsTunnel, workerUrl, template);

setFieldValue(template, "jobTemplate", jobTemplate);
}
}

private static String createJobTemplate(NomadWorkerTemplate template, String jenkinsUrl, String jenkinsTunnel, String workerUrl) {
return buildWorkerJob("%WORKER_NAME%", "%WORKER_SECRET%", jenkinsUrl, jenkinsTunnel, workerUrl, template);
}

/**
* This is basically a copy of the old NomadApi#buildWorkerJob method (plugin version < 0.8.0).
*/
Expand Down