Commit Graph
32590 Commits
Author SHA1 Message Date
Radek Antoniuk d758818b09 JENKINS-22028 - update label to reflect actual behavior 2015-06-16 23:22:08 -04:00
liorha 905930f0b1 Using JUnit assertions only
(cherry picked from commit ae20c03771)
2015-06-16 22:58:44 +02:00
liorha 726e390627 minor: items could be made final
(cherry picked from commit ce862f0b6a)
2015-06-16 22:58:30 +02:00
liorha 0612d94092 JENKINS-27289
(cherry picked from commit 7db618e64a)
2015-06-16 22:55:59 +02:00
Kohsuke Kawaguchi ce14a99b46 Merge pull request #1739 from jenkinsci/type-on-body
Expose the type information for people's JavaScript
2015-06-16 10:05:09 -07:00
Oliver Gondža 78f631805d Merge pull request #1735 from Vlatombe/JENKINS-25785_prerequisite
Prerequisite for JENKINS-25785
2015-06-16 18:56:38 +02:00
Jesse Glick f3f8abd36b Merge pull request #1725 from liorhson/JENKINS-27289-update
Contine the JENKINS-27289 ticket: update the getResources as well
2015-06-16 09:45:30 -04:00
Michael Prankl 8886b04ab5 [JENKINS-4433] Add log4j to dependency management section, exclude it for acegi-security dependency. 2015-06-16 14:49:09 +02:00
Daniel Beck a013c03368 Archive 2013 changelog entries 2015-06-16 10:29:07 +02:00
Stephen Connolly 71e684ad90 Merge pull request #1738 from stephenc/jenkins-28840
[FIXED JENKINS-28840] Deadlock between Queue.maintain and Executor.interrupt
2015-06-16 00:02:16 +01:00
Stephen Connolly e385231b40 Merge remote-tracking branch 'jenkins/master' into jenkins-28840 2015-06-16 00:01:58 +01:00
Stephen Connolly c02e02df42 prepare for merge 2015-06-16 00:00:45 +01:00
Stephen Connolly 10a8875642 Test case was subject to timing bugs
- I suspect the synchronization on Jenkins is a bug also... but not causing the test failure, so will ignore for now
2015-06-15 21:39:32 +01:00
Jesse Glick b6ae4f5b79 ExtractResourceWithChangesSCM now needs to have a descriptor.
Otherwise you get:
java.lang.AssertionError: class org.jvnet.hudson.test.ExtractResourceWithChangesSCM is missing its descriptor
	at jenkins.model.Jenkins.getDescriptorOrDie(Jenkins.java:1166)
	at hudson.scm.SCM.getDescriptor(SCM.java:654)
	at hudson.scm.AutoBrowserHolder.get(AutoBrowserHolder.java:54)
	at hudson.scm.SCM.getEffectiveBrowser(SCM.java:136)
	at hudson.scm.ChangeLogSet.browserFromBuild(ChangeLogSet.java:82)
	at hudson.scm.ChangeLogSet.<init>(ChangeLogSet.java:76)
	at org.jvnet.hudson.test.ExtractChangeLogSet.<init>(ExtractChangeLogSet.java:41)
	at org.jvnet.hudson.test.ExtractChangeLogParser.parse(ExtractChangeLogParser.java:80)
	at org.jvnet.hudson.test.ExtractChangeLogParser.parse(ExtractChangeLogParser.java:52)
	at org.jvnet.hudson.test.ExtractChangeLogParser.parse(ExtractChangeLogParser.java:46)
	at hudson.model.AbstractBuild.calcChangeSet(AbstractBuild.java:894)
	at hudson.model.AbstractBuild.access$600(AbstractBuild.java:104)
	at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:634)
	at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
	at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:528)
	at hudson.model.Run.execute(Run.java:1745)
	at …
2015-06-15 15:46:47 -04:00
Kohsuke Kawaguchi 9178977490 Expose the type information for people's JavaScript
For people doing JavaScript based page manipulation from JavaScript for
quick UI hack/prototyping, information about what the page is about is
useful, even if it's not completely reliable (e.g., the top page
reporting it's for AllView not for Hudson)
2015-06-15 10:54:24 -07:00
Daniel Beck fe83963084 Noting #1737 2015-06-15 13:59:02 +02:00
Daniel Beck d5651d171b Merge pull request #1737 from oleg-nenashev/master
[FIXED JENKINS-28601] Revert "[FIXED JENKINS-17290] -  Corrected sort order of tables"
2015-06-15 13:55:39 +02:00
Stephen Connolly 6f343dc7c2 [FIXED JENKINS-28840] Deadlock between Queue.maintain and Executor.interrupt
More fun here:

- All this originates from Executor extending Thread.
- There is funky logic in the lock handling code of the JVM that makes assumptions
  about how it might proceed with the lock when the thread holding the lock has its
  interrupt flag set.
- Really it would be better if Executor did not extend Thread as that way we wouldn't
  have to deal with some of that complexity. But OTOH we are where we are and backwards
  compatibility may make such a change not possible without a lot of breakage.
- Fixing the issue at hand, firstly requires that interrupting a Computer happens with the
  Queue lock held (to speed up tests we have Jenkins.cleanup get the lock for all Computers)
  That prevents the Queue maintain thread from getting caught
- Secondly, when removing an executor from a computer we process the removal while
  holding the Queue lock, but we move the removal itself to a separate thread if we cannot
  get the Queue lock in order to avoid deadlock.
- Also add helper methods to wrap tasks to be performed while holding the lock
  and a helper method for Runnables that exposes the tryLock functionality
2015-06-15 12:12:34 +01:00
Oleg Nenashev abef5b060f Revert "[FIXED JENKINS-17290] - Corrected sort order of tables"
This reverts commit d739bedc0d.
2015-06-14 20:05:35 +03:00
Daniel Weber a220431770 [JENKINS-9104] Add ProcessKillingVeto extension point
This allows extensions to veto killing of certain processes.

Issue 9104 is not yet solved by this, it is only part of the solution. The
rest should be taken care of in plugins.
2015-06-14 14:59:01 +02:00
Vincent Latombe a65d007533 Prerequisite for JENKINS-25785 in order to break dependency cycle when windows-slaves will depend on credentials 2015-06-13 14:18:40 +02:00
Oleg Nenashev 7e1a92157d Noting https://github.com/jenkinsci/jenkins/pull/1651 2015-06-13 13:30:32 +03:00
Oleg Nenashev 408b531931 Merge pull request #1651 from deadmoose/logger_class
Fix some loggers which are identifying as the wrong class.
2015-06-13 13:27:37 +03:00
Oleg Nenashev ea5f98fdf9 Noting https://github.com/jenkinsci/jenkins/pull/1692 2015-06-13 13:22:35 +03:00
Oleg Nenashev 67f4dd5166 Merge pull request #1692 from daspilker/JENKINS-28292
[JENKINS-28292] fixed synchronization issue when setting JDK installations
2015-06-13 13:20:07 +03:00
Oleg Nenashev 3f0e2926c0 Noting https://github.com/jenkinsci/jenkins/pull/1468 2015-06-13 13:18:36 +03:00
Oleg Nenashev d5d8463e37 Merge pull request #1468 from synopsys-arc-oss/JENKINS-25734
[JENKINS-25734] - Prevent NPE in Executor/causeOfDeath page on "expected thread death"
2015-06-13 13:15:09 +03:00
Daniel Beck 194fa5655b Noting #1733, #1730, #1704 2015-06-11 17:25:22 +02:00
Daniel Beck ad7cba99d7 Merge pull request #1733 from daniel-beck/JENKINS-14899
[FIX JENKINS-14899] Don't use truncating LargeText for /consoleText
2015-06-11 17:09:52 +02:00
Michael Prankl b6cdc39343 [JENKINS-4433] Upgrade log4j to 1.2.17 2015-06-10 22:32:13 +02:00
Jesse Glick 9b7d8e9f8a Merge pull request #1487 from KostyaSha/findbugs
Update FindBugs annotation library and maven plugin
2015-06-10 16:24:53 -04:00
Jesse Glick f971310d30 Merge pull request #1732 from jglick/PluginAutomaticTestBuilder
PluginAutomaticTestBuilder improvements
2015-06-10 10:10:44 -04:00
Stephen Connolly 4540ba71b5 Merge pull request #1730 from stephenc/jenkins-28690
[FIXED JENKINS-28690] Deadlock in hudson.model.Executor
2015-06-10 14:09:47 +01:00
Oliver Gondža f628e39928 Merge pull request #1723 from dalcouffe/master
NPE fix for AbstractProject polling when node is not available
2015-06-10 12:53:57 +02:00
Daniel Beck 20bd4e3049 [FIX JENKINS-14899] Don't use truncating LargeText for /consoleText 2015-06-10 00:49:22 +02:00
Jesse Glick 4ecd6cc837 Added testPluginActive to catch problems like in JENKINS-28816. 2015-06-09 17:14:56 -04:00
Jesse Glick a7b8ebaa7e Consolidate testCliSanity into the same HudsonTestCase run as the Jelly tests, to avoid overhead. 2015-06-09 17:00:59 -04:00
Oliver Gondža b6bff4f2c0 [JENKINS-28041] fix failing unittest builds/363 changes/363 2015-06-09 13:10:46 +02:00
Oliver Gondža 0e846fca9f Merge pull request #1704 from pjanouse/JENKINS-28041
[FIXED JENKINS-28041] - Allow delete-* CLI commands to operate on multiple arguments
2015-06-09 12:55:52 +02:00
Kanstantsin Shautsou 8e19340c0c Fixing PR comments:
- Typo
- Print error combined
- Set result only when phase like in other code parts.
- Test for expected error message in log

(cherry picked from commit 161a009271)
2015-06-09 10:00:35 +02:00
Kanstantsin Shautsou 231f658d79 Fix PR comments
- Print publisher display name instead of class, so user can understand what publisher in UI was used and failed.
- Setter for artifact archiver shows how it handle status
- Minor typos
- Added test for stacktraces in build log

(cherry picked from commit 92734a8345)
2015-06-09 10:00:10 +02:00
Kanstantsin Shautsou e18bde37c9 [FIXED JENKINS-26964] Handle AbortException right
(cherry picked from commit 625a22e63b)
2015-06-09 09:59:59 +02:00
Oliver Gondža 7a2950b7ad Fixup imports 2015-06-09 09:50:28 +02:00
Daniel Beck ba69511c47 [JENKINS-27739] Ensure cache clearing listener runs first
(cherry picked from commit c6d4204af1)
2015-06-09 09:34:03 +02:00
Daniel Beck aaf0afc54d [FIX JENKINS-27739] Clear cached env vars when node goes online
(cherry picked from commit c569036fca)
2015-06-09 09:34:03 +02:00
Kanstantsin Shautsou 59b603dc9c Update FindBugs annotation library and maven plugin 2015-06-09 02:47:23 +03:00
ikedam 16883377df [FIXED JENKINS-28192] Uses java.nio.file.Path#toRealPath instead of File#getCanonicalPath, which resolves symbolic links also on Windows. 2015-06-09 08:01:30 +09:00
Oliver Gondža 958f089244 Do not follow href after sending POST via l:task
Simple `<l:task post="true" href="someurl"/>` triggers post request as expected
but then proceeds to href as normal link to. If the URL accepts GET then request
is sent twice it if does not after POSTing on background user get
'POST is required' error.

(cherry picked from commit baa192499a)
2015-06-08 22:25:04 +02:00
Yoann Dubreuil acf716af98 [FIXED JENKINS-27549] log job full name and catch Throwable (+1 squashed commit)
Squashed commits:
[73308b5] [FIXED JENKINS-27549] job loading can be broken by a NPE in a build trigger

(cherry picked from commit 4c0d3ac623)
2015-06-08 21:20:56 +02:00
Oleg Nenashev b8ce8da788 [FIXED JENKINS-28419] - Support the reset of JenkinsLocationConfiguration::adminAddress
(cherry picked from commit 17116a2129)
2015-06-08 21:16:43 +02:00