Commit Graph
2738 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 79021cc069 [maven-release-plugin] prepare for next development iteration 2015-10-11 20:07:43 -07:00
Kohsuke Kawaguchi 4bfc8cda65 [maven-release-plugin] prepare release jenkins-1.633 2015-10-11 20:07:42 -07:00
tfennelly 2ec3ffcd53 Merge branch 'master' into JENKINS-26445-pagination-search 2015-10-09 12:28:19 +01:00
Oleg Nenashev e370009200 Merge pull request #1839 from pjanouse/JENKINS-30521
[JENKINS-30521] reload-job CLI command moved from Core to CLI
2015-10-07 13:16:09 +03:00
Kohsuke Kawaguchi e3b92c8c27 Merge remote-tracking branch 'origin/master'
Conflicts:
	changelog.html
2015-10-06 10:07:15 -07:00
Jesse Glick 31450b894c Merge pull request #1853 from jglick/CommandLauncherTest-flaky
CommandLauncherTest is flaky
2015-10-06 10:27:38 -04:00
tfennelly 95ca3da67d Merge branch 'master' into plugin-manager-dependants
* master:
  Update the changelog by new merges:
  [FIXED JENKINS-30569] HistoryWidget: fix JS syntax error
  [FIXED JENKINS-29014] render API link conditional on getApi() presence
  [JENKINS-21720] JS alert preventig to leave a configuration page even without formulary changes
  add ctags file 'tags' to .gitignore
  [maven-release-plugin] prepare release jenkins-1.632
  [FIXED JENKINS-29888] Handling all exceptions returned by logRotator
  [JENKINS-30742] Fixed possible NPE in AbstractProject.resolveForCLI()
2015-10-06 10:50:40 +01:00
Oleg Nenashev 236198883b Merge pull request #1849 from pjanouse/JENKINS-30742
[JENKINS-30742] Fixed possible NPE in AbstractProject.resolveForCLI()
2015-10-06 12:05:56 +03:00
tfennelly a8e83c3c2d Tweaks based on review comments 2015-10-06 09:44:11 +01:00
tfennelly 955eb7274a Merge branch 'master' into plugin-manager-dependants
* master: (58 commits)
  Changelog: Replace the PR reference by the JIRA issue reference
  Noting https://github.com/jenkinsci/jenkins/pull/1818
  Noting https://github.com/jenkinsci/jenkins/pull/1804
  [JENKINS-30002] Improve Util.isOverridden
  Noting #1842
  [FIXED JENKINS-30777] this concludes the fix
  [JENKINS-30777] also allow slaves to decorate logger
  [JENKINS-30777] Generalized the signature to work with Run, not just AbstractBuild.
  Diamond operator
  [FIXED JENKINS-29876] CheckForNull job in ReverseBuildTrigger
  Noting JENKINS-30084 in changelog
  [JENKINS-30084] remove extra space
  [JENKINS-30084] address feedbacks
  [JENKINS-30084] indent back
  [JENKINS-30084] fixing test
  [JENKINS-30084] fixing test
  [JENKINS-30084] enhancing test case
  [JENKINS-30084] test added to make sure a flyweight task can be blocked at last minute
  [JENKINS-30084] fix regression when flyweight task is blocked by upstream/downstream project
  [JENKINS-30084] some more polish
  ...
2015-10-05 18:51:35 +01:00
tfennelly 8dbee7b949 Added a few tests 2015-10-05 18:50:35 +01:00
Jesse Glick 263021f35e Typo. 2015-10-05 11:30:36 -04:00
Jesse Glick df7c3f0b79 commandSuceedsWithoutChannel [sic] is flaky.
For example https://ci.jenkins-ci.org/job/jenkins_main_trunk/4281/testReport/hudson.slaves/CommandLauncherTest/commandSuceedsWithoutChannel/
java.lang.AssertionError: 
Expected: a string containing "ERROR: Process terminated with exit code 0"
     but: was "… Launching slave agent
$ true
ERROR: Unable to launch the slave agent for dummy
…java.io.EOFException: unexpected stream termination
	at hudson.remoting.ChannelBuilder.negotiate(ChannelBuilder.java:333)
	at hudson.remoting.ChannelBuilder.build(ChannelBuilder.java:282)
	at hudson.slaves.SlaveComputer.setChannel(SlaveComputer.java:365)
	at hudson.slaves.CommandLauncher.launch(CommandLauncher.java:130)
	at hudson.slaves.SlaveComputer$1.call(SlaveComputer.java:238)
	at jenkins.util.ContextResettingExecutorService$2.call(ContextResettingExecutorService.java:46)
	at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
	at java.util.concurrent.FutureTask.run(FutureTask.java:166)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
	at java.lang.Thread.run(Thread.java:722)
"
	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:8)
	at hudson.slaves.CommandLauncherTest.commandSuceedsWithoutChannel(CommandLauncherTest.java:67)
2015-10-05 11:30:23 -04:00
Kohsuke Kawaguchi d1ab83b376 [maven-release-plugin] prepare release jenkins-1.632 2015-10-05 08:03:56 -07:00
Kohsuke Kawaguchi 1ed2aa5c36 [maven-release-plugin] prepare for next development iteration 2015-10-05 08:03:56 -07:00
Ing. Pavel Janousek 18833611b1 [JENKINS-30521] reload-job CLI command moved from Core to CLI 2015-10-05 10:56:29 +02:00
Oleg Nenashev 339dd4ace5 Merge pull request #1842 from KostyaSha/patch-3
[FIXED JENKINS-29876] CheckForNull job in ReverseBuildTrigger
2015-10-03 22:53:13 +03:00
Kohsuke Kawaguchi 4c4367113f [JENKINS-30777] also allow slaves to decorate logger 2015-10-02 16:33:34 -07:00
Kanstantsin Shautsou 45e4e99026 [FIXED JENKINS-29876] CheckForNull job in ReverseBuildTrigger 2015-10-02 15:54:06 +03:00
Ing. Pavel Janousek 37c5656f2c [JENKINS-30742] Fixed possible NPE in AbstractProject.resolveForCLI() 2015-10-02 14:45:36 +02:00
Stephen Connolly 5a5f9c5d10 Merge pull request #1815 from varmenise/OSS-192
[FIXED JENKINS-30084] FlyWeightTasks tied to a label will not cause node provisioning and will be blocked forever.

When a flyweighttask is limited to run on a specific label (e.g. matrix project set restrict where this project can run) if there are no nodes with that label available when it enters the queue then it will immediately move to blocked.
As it is blocked the Node provisioner will not attempt to create any slaves, so the project will sit in the queue forever (or until some other project allocates a slave with the correct label).
2015-10-02 09:19:40 +01:00
Valentina Armenise 8d113a1067 [JENKINS-30084] address feedbacks 2015-10-02 09:53:35 +02:00
Valentina Armenise 37a372d154 [JENKINS-30084] fixing test 2015-10-02 09:53:35 +02:00
Valentina Armenise 562c0e5f00 [JENKINS-30084] fixing test 2015-10-02 09:53:35 +02:00
Valentina Armenise 3b4c09e4e9 [JENKINS-30084] enhancing test case 2015-10-02 09:53:34 +02:00
Valentina Armenise e33f3f62db [JENKINS-30084] test added to make sure a flyweight task can be blocked at last minute 2015-10-02 09:53:34 +02:00
Valentina Armenise 65d1fe5b1d [JENKINS-30084] some more polish 2015-10-02 09:53:33 +02:00
Valentina Armenise e1904e02d4 [JENKINS-30084] some stylish changes 2015-10-02 09:53:33 +02:00
Valentina Armenise a19c7936bf [JENKINS-30084] cleanup 2015-10-02 09:53:32 +02:00
Valentina Armenise cfef72b1b2 [JENKINS-30084] cleanup 2015-10-02 09:53:32 +02:00
Valentina Armenise 50ae0f4da9 [JENKINS-30084] cleanup 2015-10-02 09:53:31 +02:00
Valentina Armenise 9a24957247 [JENKINS-30084] new comment for test 2015-10-02 09:53:31 +02:00
Valentina Armenise 53f909620d [JENKINS-30084] new location and implementation of the test 2015-10-02 09:53:31 +02:00
Valentina Armenise 750cdb64bf [JENKINS-30084] updated references of Jenkins Issue 2015-10-02 09:53:30 +02:00
Valentina Armenise a5a2c45d2e [JENKINS-30084] added test case 2015-10-02 09:53:30 +02:00
Oliver Gondža fca99dcc14 Merge pull request #1843 from olivergondza/JENKINS-30705
[FIXED JENKINS-30705] Optimize TagCloud calculation
2015-10-01 19:13:30 +02:00
Oliver Gondža 8c122402b2 Merge pull request #1845 from olivergondza/assume
Do not skip tests silently
2015-10-01 19:13:20 +02:00
Oliver Gondža 05382a6da7 Use JUnit4 for JNLPLauncherTest to get support for assumptions 2015-10-01 13:28:23 +02:00
Oliver Gondža 3990384257 Do not skip tests silently 2015-10-01 08:58:31 +02:00
Oliver Gondža 52f9172c69 [JENKINS-30705] Reset cache for exact results in unittest 2015-09-30 17:15:41 +02:00
Kohsuke Kawaguchi cbf437d8e3 [maven-release-plugin] prepare for next development iteration 2015-09-27 18:04:30 -07:00
Kohsuke Kawaguchi 251835eca7 [maven-release-plugin] prepare release jenkins-1.631 2015-09-27 18:04:30 -07:00
Oliver Gondža 699d2b22ad Merge pull request #1840 from pjanouse/JENKINS-30613
[JENKINS-30613] Code clean-up
2015-09-24 09:05:27 +02:00
Ing. Pavel Janousek 9588a09610 [JENKINS-30613] Code clean-up 2015-09-23 15:40:32 +02:00
Kohsuke Kawaguchi 3839ddfe1f [maven-release-plugin] prepare for next development iteration 2015-09-20 11:59:39 -07:00
Kohsuke Kawaguchi 4e3e2a6bb0 [maven-release-plugin] prepare release jenkins-1.630 2015-09-20 11:59:38 -07:00
Jesse Glick 43f4b2b570 Merge pull request #1826 from jglick/ClosedByInterruptException
[JENKINS-30395] Occasional ClosedByInterruptException
2015-09-17 14:28:01 -04:00
Vojtech Juranek 8f29260b17 [FIXED JENKINS-29507] Make JenkinsRule useable on systems without glibc 2015-09-17 19:56:51 +02:00
tfennelly a305e3dc93 Merge branch 'master' into JENKINS-26445-pagination-search
* master: (256 commits)
  Noting #1817
  Noting #1825
  updated changelog for release
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release jenkins-1.629
  [JENKINS-30139] Oleg wants to keep the data accessible so we have to go for immutable
  [JENKINS-30139] Forgot to change this one
  [JENKINS-30139] Add @Restricted to prevent external use of internal data
  [JENKINS-30139] Switch from a big fat lock to a concurrent collection
  [JENKINS-30374] Update obsolete help message
  updated changelog for release
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release jenkins-1.628
  noting merge of PR#1816 - use slf4j interceptors
  Manage commons-logging and log4j as provided, include slf4j adapters for tests.
  Exclude commons-logging and log4j in dangerous scopes compile and runtime in plugins as well.
  Only exclude commons-logging and log4j in dangerous scopes compile and runtime.
  Reintroduce enforcer rules as suggested by @jtnord.
  Document allBuilds for Job remote access API
  Include slf4j-jdk14 during tests.
  ...

Conflicts:
	war/src/main/webapp/scripts/hudson-behavior.js
2015-09-16 09:34:46 +01:00
Kohsuke Kawaguchi 16f2877729 [maven-release-plugin] prepare for next development iteration 2015-09-15 00:08:56 -07:00