[FIXED JENKINS-29989] Update RunIdMigrator to properly handle matrix and Maven jobs #1802
Conversation
Properly revert job history for matrix and maven jobs (depending on setup). Examples paths include: jobs/someproject/Environment=prod/builds jobs/someproject/test$test/builds
|
Test failures in unrelated code: hudson.slaves.CommandLauncherTest.commandFails |
jglick
changed the title
| @@ -350,6 +350,11 @@ private void unmigrateJobsDir(File jobs) throws Exception { | |||
| return; | |||
| } | |||
| for (File job : jobDirs) { | |||
|
|
|||
| if (job.getName().equals("builds")) { | |||
There was a problem hiding this comment.
Comment now on line 369 should be edited to clarify that the older clause handles grandchildren from getRootDirFor whereas this clause handles direct children.
|
👍 The deadline for 1.609.3 has long since passed I am afraid. |
|
@jglick why not do 1.609.4? |
|
1.609.3 was delayed, why not pick it? Or at least merge into master? |
|
Please squash commits and exclude "minor cleanup to trigger pull request". For re-triggering this damn PR builder you can close and open PR. |
[FIXED JENKINS-29989] Update RunIdMigrator to properly handle matrix and Maven jobs
|
@jglick you are messing commit history and git-blame with such commits, it not so difficult to squash it. |
|
Nor is it so difficult to use the Git commands that pay attention only to the first merge parent. History is history, you can look at it in different ways, but rebasing is a black hole. |
| @Test public void reverseMatrixAfterNewBuilds() throws Exception { | ||
| File root = dir; | ||
| dir = new File(dir, "jobs/someproject/Environment=prod/builds"); | ||
| write("1/build.xml", "<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <timestamp>1388649845000</timestamp>\n <otherstuff>ok</otherstuff>\n</run>"); |
There was a problem hiding this comment.
please move such strings to resources in future
* master: (77 commits) updated changelog for release [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release jenkins-1.626 [FIXED JENKINS-25205]: "Slaves in label" produces wrong results [JENKINS-29989] Noting merge of jenkinsci#1802. @SInCE maven-hpi-plugin -> 1.114 Multi-catch in SCMTrigger.class FB annotation in SequentialExecutionQueue FB annotations and Diamons in CronTabList.class FB annotations in TimerTrigger.class FB annotations for Trigger.class FB annotations and diamond in ReverseBuildTrigger.class Protect from race condition in Triggers test-annotations -> 1.2 compiler tweaks and address review comments [JENKINS-30057] NodeProperties should be owned by the corresponding Saveable. Consistently use 'issue' instead of 'JENKINS' Disambiguate message for 1.623 Move entries from trunk to 1.625 ...
|
@KostyaSha thanks - I will squash commits as necessary in the future. |
|
@jpederzolli thanks for fix! |
[FIXED JENKINS-29989] Update RunIdMigrator to properly handle matrix and Maven jobs (cherry picked from commit 3d7878f)
JENKINS-29989
Properly revert job history for matrix and maven jobs.
This should be applied to the 1.609.X LTS branch as well since that is the first LTS to use the new build id format.