Commit Graph
32590 Commits
Author SHA1 Message Date
apetres e7fbce371e Allow disabling process killing on interruption (#3293)
* Allow disabling process killing on interuption

Plugins may want to do custom action when the execution of a remote process is interrupted. Currently it is not possible, because
the process started on a slave is killed on interruption.
My actual use case: https://groups.google.com/forum/#!msg/jenkinsci-dev/s6IkynOzdqE/2eFNKN9lAAAJ

My solution is to have a flag called killWhenInterrupted, set by default to true, which prevents process killing on the slave when unset.

* Invert killWhenInterrupted flag

* Add javadoc
2018-03-10 20:55:32 +01:00
Berno Langer 3fc392108a [JENKINS-48821] - Don't forget estimated duration of asynchronous jobs (#3329)
* Don't forget estimated duration of asynchronous jobs.

When jobs are executed, the estimated duration is calculated, memorized
and reseted when the job is finished.

But when the job is executed asynchronously (e.g. as for pipeline
scripts), the execution is just triggered. Therefore the estimated
duration should remain - and not be reseted after triggering.

JENKINS-48821: Time remaining for all pipeline jobs is N/A
JENKINS-49616: Estimated time remaining NA

* Reset cached estimated duration also when asynchronous job ends.
2018-03-10 16:57:37 +01:00
Ka-Wing 4f33d8a827 Improve dutch translation (#3323)
* Improved Dutch translations.

* Improved Dutch translations.

* Improved Dutch translations.

* Improved Dutch translations.
2018-03-10 16:56:18 +01:00
surenpi ed8d905c2c Remote unnecessary localization from levels.jelly 2018-03-10 19:08:32 +08:00
surenpi d0ff04d476 Remote unnecessary localization from advanced.jelly 2018-03-10 19:06:28 +08:00
surenpi 0dd91bbf8c Remote unnecessary localization from advanced.jelly 2018-03-10 19:02:50 +08:00
surenpi 8455bc432d Remote unnecessary localization from editDescription.jelly 2018-03-10 18:58:16 +08:00
Akbashev Alexander 6232491965 Do not copy all build numbers in case of descending search (#3228)
[JENKINS-50056] - Do not copy all build numbers in case of descending search
2018-03-10 01:47:18 +01:00
Jesse Glick cfddf9fe54 Merge pull request #3311 from jglick/artifactId
Choose more mnemonic artifactId’s for modules not consumed externally
2018-03-09 16:25:28 -05:00
Jesse Glick 1f4f76ffca Merge pull request #3254 from jglick/heavyweight-JENKINS-46652
[JENKINS-46652] Check Computer.BUILD permission only on heayweight tasks
2018-03-09 15:16:48 -05:00
Jesse Glick 0ffb87cbbb Tests can attempt to serialize RetentionStrategy.NOOP. 2018-03-09 15:12:19 -05:00
Jesse Glick 8492421ce1 FilePath.exists is apparently called from LogRecorderManagerTest.loggingOnSlaves (though I cannot reproduce this). 2018-03-09 15:03:33 -05:00
Jesse Glick e532099b08 remoting.version=3.18 2018-03-09 14:49:35 -05:00
Jesse Glick 8f6fa6154f Merge branch 'master' into anonymous-warning-JENKINS-49994 2018-03-09 14:46:40 -05:00
Jesse Glick 596e429fb4 Merge branch 'master' into artifactId 2018-03-09 14:39:18 -05:00
Jesse Glick 7868cd6b93 DoNotUse was a bit too strict for some purposes; switching to NoExternalUse. 2018-03-09 12:52:56 -05:00
Jesse Glick d94049cc71 https://github.com/kohsuke/localizer/pull/11 actually works now. 2018-03-09 12:51:56 -05:00
Jesse Glick 0fd8808b22 Merge branch 'master' into access-modifier 2018-03-09 12:23:13 -05:00
Jesse Glick f57b841fc8 access-modifier.version=1.13 2018-03-09 12:20:24 -05:00
surenpi f77d3de861 Remove submit custom label 2018-03-09 13:37:51 +08:00
surenpi 557ac5ea74 Move descriptionFrom's translate into 'submit' 2018-03-09 09:32:35 +08:00
Oleg Nenashev c84cbf32d1 Update to Parent POM 1.40 with configured FindBugs (#3308)
* Update to Parent POM 1.40 with configured FindBugs

* Used the released version of Parent POM, address comments from @dwnusbaum
2018-03-08 15:35:35 +01:00
Daniel Trebbien aaae71af4b [JENKINS-49971] Fix a race condition in Util.loadFile() (#3225)
* Fix a race condition in Util.loadFile()

If the file is deleted in between when its existence is checked and the
file is opened for reading, then the method will fail to return an empty
string.

* Switch to using FileUtils.readFileToString()
2018-03-08 00:53:53 +01:00
Literallie 12031d7d59 [JENKINS-45387] Fix validation error displaying in setup wizard's "create first admin" form (#3116)
* [JENKINS-45387] Improve setup wizard account creation in security realm

This commit adds an additional account creation method to the
security realm, that allows to create a new user account (as the system)
and is intended to be used by the setup wizard.

The main difference to the existing method is that the new method does
not force the Stapler to send a response, but instead throws an
exception if invalid data is submitted. This allows to call this from
the setup wizard, and send the response there. (This is necessary
because the setup wizard method has a response return type and
there is no way to access the response already send in the realm)

Further, it splits the private createAccount() method for
clarity as well as to allow code reuse from the new method.

* [JENKINS-45387] Fix SetupWizard sending responses twice on create admin

This commit fixes an issue where the SetupWizard class would send
two responses (indirectly) when invalid form data was provided for
creating the first admin account.

* [Fix JENKINS-45387] Setup wizard not displaying first account errors

This commit fixes the setup wizard not displaying HTML error
responses upon first account creation.

Previously, it just froze (buttons were not re-enabled) and didn't
display responses. (Probably caused by XSS policies on the iframe)

* [JENKINS-45387] Add some @Restricted annotations

As per
https://github.com/jenkinsci/jenkins/pull/3116#discussion_r172031063
https://github.com/jenkinsci/jenkins/pull/3116#discussion_r172051979
2018-03-08 00:06:57 +01:00
Daniel Trebbien 145c606e83 Refactor TextFile.lines() (#3211)
* Refactor TextFile.lines()

Introduces a LinesStream utility class that is responsible for closing
the underlying file handle.

Switches to calling Files.newBufferedReader() instead of wrapping the
InputStream returned by Files.newInputStream() in a BufferedReader of
an InputStreamReader.

Creates the file reader at the time that lines() is invoked, instead of
at the time that iterator() of the returned Iterable is invoked. This
can help prevent confusion as to the cause of an exception, whether it's
because of a problem opening the file or reading from it.

* Delete a duplicate import and a now-unused import

* Introduce load2()

* Add a @Deprecated annotation
2018-03-08 00:02:52 +01:00
Jesse Glick 73b16084f9 [JENKINS-49994] Warn about Remoting serialization of anonymous inner classes and their ilk. 2018-03-07 14:52:34 -05:00
Jesse Glick 93b951046f Merge pull request #3332 from jglick/message-JENKINS-49795
s/JENKINS-49573/JENKINS-49795/g in messages
2018-03-07 14:43:50 -05:00
Daniel Beck 78914340e6 Merge master into security-master 2018-03-07 15:51:57 +01:00
Daniel Beck 697ba26e80 Merge (-s ours) stable-2.107 into master 2018-03-07 15:51:57 +01:00
Daniel Beck 35026d20c4 Merge (-s ours) stable-2.89 into stable-2.107 2018-03-07 15:51:56 +01:00
Daniel Beck c92b229380 Merge commit '7add30c023590fbb3529c6ff5b555317c1717d3f' into security-master 2018-03-07 15:47:53 +01:00
Daniel Beck 6b60e75ede Merge commit '7add30c023590fbb3529c6ff5b555317c1717d3f' of git://github.com/jenkinsci/jenkins 2018-03-07 15:43:54 +01:00
Jesse Glick 48c95f5aee s/JENKINS-49573/JENKINS-49795/g in messages. 2018-03-07 08:48:34 -05:00
Oleg Nenashev c5e96fb618 Merge pull request #3330 from kshultzCB/run-project-fix-typo
Very small readability change to some inline help
2018-03-07 02:34:14 +01:00
Oleg Nenashev 02eebecfab Merge pull request #3317 from daniel-beck/JENKINS-32599
[JENKINS-32599] Ignore misplaced users/config.xml file
2018-03-07 02:33:44 +01:00
Jesse Glick 64ee6fdade Merge branch 'master' into VirtualFile-JENKINS-49635 2018-03-06 12:29:25 -05:00
kshultzCB 898291b233 Very small readability change to some inline help 2018-03-06 11:40:56 -05:00
Jesse Glick bb591f85ec Merge branch 'master' into artifactId 2018-03-06 09:12:44 -05:00
Jesse Glick ff34532460 [JENKINS-39495] Defend against a null serialized ParametersAction.parameters. 2018-03-05 17:52:17 -05:00
Kohsuke Kawaguchi 7add30c023 [maven-release-plugin] prepare for next development iteration 2018-03-05 12:12:30 -08:00
Kohsuke Kawaguchi 76058c77ad [maven-release-plugin] prepare release jenkins-2.110 jenkins-2.110 2018-03-05 12:12:30 -08:00
Daniel Beck 8a92fe8eb1 Merge pull request #3325 from jglick/InstallState-madness
Fixing serialization of InstallState
2018-03-05 20:12:51 +01:00
Jesse Glick 9dd5bd355d Fixing serialization of InstallState. 2018-03-05 11:09:11 -05:00
Jesse Glick 63885e664d Typo noticed by @olivergondza. 2018-03-05 10:03:07 -05:00
Jesse Glick 23f12fd8f5 Merge branch 'master' into VirtualFile-JENKINS-49635 2018-03-05 10:02:42 -05:00
Jesse Glick 137662eba2 Merge branch 'master' into artifactId 2018-03-05 10:01:36 -05:00
Jesse Glick 50878a329e Merge branch 'master' into heavyweight-JENKINS-46652 2018-03-05 09:59:26 -05:00
Oleg Nenashev 6117535d66 Merge pull request #3322 from suren-jenkins/suren-zh
Add Chinese translation
2018-03-04 15:34:35 +01:00
Oleg Nenashev 67a610338a Merge pull request #3316 from daniel-beck/JENKINS-49642
[JENKINS-49642] Fix proxy view recursion
2018-03-04 15:13:54 +01:00
surenpi 6c3a393fa9 Change default text from 'Ok' to 'Submit' 2018-03-04 21:37:11 +08:00