Commit Graph
5063 Commits
Author SHA1 Message Date
Jerome Lacoste 58166dfb2b Merge remote branch 'upstream/master'
Reapplied 329a020188

Conflicts:
	core/src/main/java/hudson/widgets/HistoryWidget.java
2011-02-05 07:38:58 +01:00
Kohsuke Kawaguchi f88a2ba333 Merge branch 'JENKINS-4756'
* JENKINS-4756:
  minor touch up
  FIXED JENKINS-4756 the executor number was not always unique. Computer.executors.size() does not provide a unique number within one Computer.
2011-02-04 21:28:12 -08:00
Kohsuke Kawaguchi 36d9b56250 minor touch up 2011-02-04 21:28:01 -08:00
Kohsuke Kawaguchi 6c521259e2 [FIXED JENKINS-8660] recording the fix from Jerome Lacoste. 2011-02-04 21:15:03 -08:00
Kohsuke Kawaguchi 691f230519 Merge branch 'JENKINS-8660'
* JENKINS-8660:
  fail more gracefully if the header is not provided.
  JENKINS-8660: loading the build history cause an NPE on the History Widget
2011-02-04 21:12:49 -08:00
Kohsuke Kawaguchi 329a020188 fail more gracefully if the header is not provided. 2011-02-04 20:34:09 -08:00
Kohsuke Kawaguchi f8515e96fe Merge branch 'HUDSON-8656' of https://github.com/nairb774/jenkins 2011-02-04 20:18:23 -08:00
Brian Atkinson e7eac75978 This adds a test from HUDSON-8656, and is likely related to issues found in
HUDSON-8401.

This grouping of tests targets all Sunday to *another day of week* cron
tabs. There are likely other pairs that could be tested, but this seemed to
work out most of the bugs.
2011-02-04 18:45:12 -06:00
Richie Vos 9d7d0d753d Add the build's description to the build feed 2011-02-04 16:49:45 -06:00
Olivier Lamy 774f655398 Merge branch 'lacostej-pull5' of https://github.com/lacostej/jenkins 2011-02-04 23:41:00 +01:00
Jerome Lacoste 9005eb665f JENKINS-8676 Windows XP slave stopped working in 1.396 (related to name change)
After thinking about it, I don't want to deal with hudsonslave here. jenkinsslave should be found anyway, so that code path should not have been triggered.
And cleaning up residual services isn't jenkins job. Otherwise both can't coexist.
2011-02-04 22:36:11 +01:00
Jerome Lacoste f40b4ffbc8 JENKINS-8676 Windows XP slave stopped working in 1.396 (related to name change)
After thinking about it, I don't want to deal with hudsonslave here. jenkinsslave should be found anyway, so that code path should not have been triggered.
And cleaning up residual services isn't jenkins job. Otherwise both can't coexist.
2011-02-04 22:34:26 +01:00
Jerome Lacoste 3106a80bcf Merge remote branch 'upstream/master' 2011-02-04 21:37:39 +01:00
Nathan Parry a88920aab7 Fix JENKINS-8196
Persist a user-requested offline status for a slave across
restarts. Previously slaves would come back online if the server
was restarted while they were marked 'temporarily offline'.

I believe this also addresses JENKINS-7934 and JENKINS-7805
which look like duplicates.
2011-02-04 12:09:40 -08:00
Jerome Lacoste 4077b5da1c Merge remote branch 'upstream/master' 2011-02-04 20:33:22 +01:00
Jerome Lacoste 020a4ee92a JENKINS-8686 IO stream copies are not done properly.
Some more work:
* reviewed some callers
* took note that some classes have been moved into stapler
* used IOUtil.closeQuietly() in a few places
2011-02-04 15:34:26 +01:00
Jerome Lacoste bfbaf2c9d9 JENKINS-8686 IO stream copies are not done properly.
First pass at making sure we don't stop copying when the reader reads 0 characters.

I will now also review the callers for our internal code, and check if we can use IOUtils methods instead.
2011-02-04 15:34:07 +01:00
Janick Reynders 88a2860339 FIXED JENKINS-4756 the executor number was not always unique. Computer.executors.size() does not provide a unique number within one Computer. 2011-02-03 23:21:01 +01:00
Jerome Lacoste a8a931d8ec JENKINS-8676 Windows XP slave stopped working in 1.396 (related to name change)
The ManagedWindowsServiceLauncher refers to hudson.exe and hudson-slave.exe while we renamed the artifact to jenkins.exe.

Tentative fix, completely untested (no windows box around).
Not sure about the service name (jenkinsslave). I added a second check for backward compatibility but I have no idea if it's useful.
2011-02-03 23:08:12 +01:00
Jerome Lacoste 9a13990be9 JENKINS-8660: loading the build history cause an NPE on the History Widget
loadAllBuildHistory() fails to set the headers field on the replacement buildHistory DOM element.

The patch fixes the problem by recreating a headers field.
It also:
* slightly refactor the loadAllBuildHistory() method for readability
* add a FIXME note that the server side history widget should fail if the n parameter is missing.
* add a pre-condition check to the buildHistory() update to catch potential bugs (note that the logging is disabled as Yahoo.log doesn't appear available)
2011-02-03 23:03:07 +01:00
Andrew Bayer 6424a80c98 Merge branch 'lacostej-pull' of https://github.com/lacostej/jenkins into lacostej-lacostej-pull 2011-02-03 13:51:39 -08:00
Jerome Lacoste 2332b114a3 JENKINS-8676 Windows XP slave stopped working in 1.396 (related to name change)
The ManagedWindowsServiceLauncher refers to hudson.exe and hudson-slave.exe while we renamed the artifact to jenkins.exe.

Tentative fix, completely untested (no windows box around).
Not sure about the service name (jenkinsslave). I added a second check for backward compatibility but I have no idea if it's useful.
2011-02-03 22:20:25 +01:00
alanharder 3ba54b53ae hudson.war/jenkins.war changes.. made getBackupVersion use getHudsonWar()+".bak"
to match 2 other methods in this file (instead of hardcoded hudson.war.bak)
2011-02-03 09:47:50 -08:00
alanharder b3c661d59b some hudson.war/jenkins.war changes 2011-02-03 09:41:00 -08:00
Jerome Lacoste 3ddb68f038 JENKINS-8660: loading the build history cause an NPE on the History Widget
loadAllBuildHistory() fails to set the headers field on the replacement buildHistory DOM element.

The patch fixes the problem by recreating a headers field.
It also:
* slightly refactor the loadAllBuildHistory() method for readability
* add a FIXME note that the server side history widget should fail if the n parameter is missing.
* add a pre-condition check to the buildHistory() update to catch potential bugs (note that the logging is disabled as Yahoo.log doesn't appear available)
2011-02-03 13:06:57 +01:00
Jerome Lacoste 42c0bdb703 JENKINS-8658 cleanup. Inner class can be static 2011-02-03 05:38:50 +01:00
Jerome Lacoste 4f857bccb7 JENKINS-8658 let getHomeDir gather information about where it finds its location. Useful for troubleshooting. 2011-02-03 04:47:07 +01:00
Brad Trimby 0b424d6902 Change 'Hudson Continuous Integration server' to Hudson.getDisplayName() in test email 2011-02-02 21:33:38 -05:00
Kohsuke Kawaguchi 31a76bc4cb Merge branch 'after-first-release'
... so as to follow the convention of keeping the master branch open for
commits.

* after-first-release:
  noting the changes
  Other languages on JVM may not be able to provide the type information.
  Added autocomplete feature to BuildTrigger
2011-01-31 19:11:04 -08:00
petehayes 31b9a2f48d Fixed HUDSON-6689. Updated the primary view name (default view) if someone changed the name of the view that was marked as primary. 2011-01-31 20:59:01 -05:00
Kohsuke Kawaguchi a178194fb5 Merged pull request #19
* commit '0ffa03278e597edcde5576971a7e51b8938d6edd':
  Added autocomplete feature to BuildTrigger
2011-01-31 13:10:17 -08:00
Kohsuke Kawaguchi 237dbe3e2b Other languages on JVM may not be able to provide the type information. 2011-01-31 12:59:07 -08:00
Kohsuke Kawaguchi d14ca2cec7 regression in renaming 2011-01-31 10:06:11 -08:00
Kohsuke Kawaguchi 4ab9ad2634 bug fix 2011-01-31 10:06:11 -08:00
Kohsuke Kawaguchi 31cd5b3ad9 Renamed the Windows installer 2011-01-31 00:06:49 -08:00
Kohsuke Kawaguchi f08fd38a76 hudson-cli.jar to jenkins-cli.jar rename 2011-01-30 23:51:35 -08:00
Kohsuke Kawaguchi 3a1447ea9a Updating the URL. 2011-01-30 23:44:52 -08:00
Kohsuke Kawaguchi ebd0b303ed Typo as pointed out by Dean. 2011-01-30 21:54:36 -08:00
Kohsuke Kawaguchi 8ea876faa4 Honor $JENKINS_HOME.
Honor $JENKINS_HOME (just like we used to do $HUDSON_HOME)
We still fall back to $HUDSON_HOME every step of the way
for maximum backward compatibility.

I wasn't initially planning to do this for the first version,
but working on native packages made me think we should deliver this.
2011-01-30 16:25:58 -08:00
Stefan Wolf 0ffa03278e Added autocomplete feature to BuildTrigger 2011-01-30 23:19:11 +01:00
Kohsuke Kawaguchi 68ed742227 [FIXED HUDSON-5055] allow the same JNLP slave to reconnect without getting rejected. 2011-01-24 13:40:59 -08:00
Kohsuke Kawaguchi 52c21f2df7 If a master fails to ping a slave, it should be hard-disconnected. 2011-01-24 13:40:59 -08:00
Kohsuke Kawaguchi 3356f4da29 improved error handling 2011-01-24 13:40:59 -08:00
Kohsuke Kawaguchi ad510a42b9 should take SIDs from projects into account 2011-01-24 13:40:59 -08:00
Kohsuke Kawaguchi 8411557322 [FIXED HUDSON-8401] calendar handling fix with Mon-Sun week (as opposed to Sun-Sat week)
Having a calendar with the first day of week being Monday (such as in the en_GB locale), setting DoW to Sunday moves the calendar forward whereas in cron it expects the calendar to go backward in time.

 Adjusting this logic.
2011-01-21 10:29:49 -08:00
Kohsuke Kawaguchi 41674eac35 allow an update center to depend on plugins from other update centers 2011-01-20 22:31:04 -08:00
alanharder fcd0559105 Add @since for toWindowsCommand() 2011-01-18 13:52:36 -08:00
Seiji Sogabe 46f2f02f9d [FIXED HUDSON-8438] Node names can be edited to include slashes and then cannot be removed. 2011-01-15 21:18:19 +09:00
Kohsuke Kawaguchi 5f29d615a8 [HUDSON-5073] point the user to the slave log if the build failed because the slave went offline during the build. 2011-01-14 15:51:34 -08:00
Kohsuke Kawaguchi d7a4e08a9d added a new note that creates expandable details. 2011-01-14 15:49:00 -08:00