Commit Graph
4603 Commits
Author SHA1 Message Date
Gavin Mogan 285c979643 [JENKINS-55062] Add tests to confirm res and root urls are now set 2018-12-20 10:47:03 -08:00
Kohsuke Kawaguchi bcc4e4fe9c [maven-release-plugin] prepare for next development iteration 2018-12-16 21:07:20 -08:00
Kohsuke Kawaguchi 0f477dc3be [maven-release-plugin] prepare release jenkins-2.156 2018-12-16 21:07:07 -08:00
Jesse Glick 208b42a3ca Blocking Lifecycle.restart from within JenkinsRule. 2018-12-12 11:36:04 -05:00
Jesse Glick a701c1af98 Merge branch 'master' into timeout-diagnosis 2018-12-12 10:38:14 -05:00
Jesse Glick e3b1f32a42 JenkinsBuildsAndWorkspacesDirectoriesTest also has a restart issue, it seems. 2018-12-12 10:36:58 -05:00
Jesse Glick 65a121c1bb Suppressing a flaky test.
https://ci.jenkins.io//job/Core/job/jenkins/job/master/1179//testReport/junit/hudson.model/QueueTest/Windows_jdk8___Windows_Publishing___testBlockBuildWhenUpstreamBuildingLock/
2018-12-12 08:56:10 -05:00
Jesse Glick d121e08b5b Seeing if this helps. 2018-12-11 22:27:36 -05:00
Jesse Glick 25823d91ce Clarifying reason for suppression. 2018-12-11 09:30:32 -05:00
Jesse Glick 50df56352c Suppressing some tests which fail in CI. 2018-12-10 17:16:15 -05:00
Matt Sicker 3709fc1766 Tabs -> spaces 2018-12-07 14:06:18 -06:00
Matt Sicker 28be9e4dcc Improve test assertion
This fixes a test to check an empty map using a proper method rather than relying on its toString representation.
2018-12-07 14:05:00 -06:00
Kohsuke Kawaguchi 63f439c062 [maven-release-plugin] prepare for next development iteration 2018-12-03 13:36:29 -08:00
Kohsuke Kawaguchi eedb77b38e [maven-release-plugin] prepare release jenkins-2.154 2018-12-03 13:36:20 -08:00
Daniel Beck dfa84afa43 Merge branch 'security-stable-2.150' into security-master 2018-11-23 00:21:56 +01:00
Daniel Beck 896356a038 Merge commit '8d429ff13b2013ff0b390d59f9c8a7674e6d24a1' into security-master 2018-11-23 00:19:45 +01:00
Daniel Beck 2044726716 Merge branch 'security-stable-2.138' into security-stable-2.150 2018-11-23 00:07:50 +01:00
Daniel Beck 79384efd22 Merge branch 'stable-2.150' into security-stable-2.150 2018-11-23 00:07:37 +01:00
Wadeck Follonier 7bae6dd6ef [SECURITY-1072] Make ApiTokenStats work 2018-11-22 11:57:29 +01:00
Daniel Beck db5defdf2f Merge branch 'security-stable-2.150' into security-master 2018-11-21 15:42:46 +01:00
Daniel Beck 90b6d47af7 Merge branch 'security-stable-2.138' into security-stable-2.150 2018-11-21 15:38:34 +01:00
Daniel Beck 3353e66082 Merge branch 'security-stable-2.121' into security-stable-2.138 2018-11-21 15:36:25 +01:00
Daniel Beck 19698a8262 Merge branch 'security-stable-2.107' into security-stable-2.121 2018-11-21 15:33:15 +01:00
Daniel BeckandWadeck Follonier 47f38d714c [SECURITY-595]
Co-Authored-By: Wadeck Follonier <wadeck.follonier@gmail.com>
2018-11-21 15:09:49 +01:00
Daniel Beck 9c7c4d930f Merge branch 'security-stable-2.150' into security-master 2018-11-21 14:28:24 +01:00
Daniel Beck 69eacee964 Merge branch 'security-stable-2.138' into security-stable-2.150 2018-11-21 14:25:44 +01:00
Daniel Beck 23ea44f9ae Merge branch 'security-stable-2.121' into security-stable-2.138 2018-11-21 14:22:28 +01:00
Daniel Beck 748e2f326e Merge branch 'security-stable-2.107' into security-stable-2.121 2018-11-21 13:52:38 +01:00
Jeff Thompson 4ed66e5838 [SECURITY-1072] 2018-11-21 13:46:31 +01:00
Wadeck Follonier c19cc70568 [SECURITY-904] 2018-11-21 13:41:15 +01:00
Jesse Glick a972c43982 Merge pull request #3757 from jglick/generateConsoleAnnotationScriptAndStylesheet
[JENKINS-38719] Console note/annotator script.js URLs must include SESSION_HASH

(cherry picked from commit 0331d47d60)
2018-11-21 09:49:48 +01:00
Francisco Fernández 27618374de [JENKINS-54310] java.io.IOException: Stream is closed when the CLI has not read entirely the input (#3708)
* [JENKINS-54310] read the input at once

* [JENKINS-54310] reading as String

* [JENKINS-54310] Change the approach for those CLI that open a shell

(cherry picked from commit f6ef70a8d4)
2018-11-21 09:30:20 +01:00
Kohsuke Kawaguchi 8d429ff13b [maven-release-plugin] prepare for next development iteration 2018-11-19 00:12:34 -08:00
Kohsuke Kawaguchi 6651623f14 [maven-release-plugin] prepare release jenkins-2.152 2018-11-19 00:12:26 -08:00
Ramon Leon 7aef24d454 [JENKINS-54459] Avoid Angry Jenkins when check now on Plugin Manager (#3718)
* [JENKINS-54459] Avoid angry Jenkins in Plugin Manager. Check Now

* [JENKINS-54459] Avoid angry Jenkins in Plugin Manager. Check Now

* [JENKINS-54459] Fix updateSiteRightJsonTest in Windows

* [JENKINS-54459] Minor fixes

* Avoid deprecated getInstance

Co-Authored-By: MRamonLeon <manuelramonleonjimenez@gmail.com>

* [JENKINS-54459] Some fixes

- Better system properties initialization
- Rename properties
- Localized messages
- Add test for change log level message
- Restore signatureCheck field after test
- Other minor improvements

* [JENKINS-54459] Add Retrier generic class and use it in the checking

* [JENKINS-54459] Improving Spanish messages

* [JENKINS-54459] Fix two javadoc errors

* [JENKINS-54459] Rename constants and its visibility

Rename the constants to do the retries and change their visibilities.

Change the package of the test to be able to access the constants in
order to redefine their values in the tests.

* [JENKINS-54459] Avoid external use of Retrier and test the delay time
2018-11-17 11:56:21 +01:00
Oleg Nenashev df52c7f28d Merge pull request #3759 from oleg-nenashev/java11/JJENKINS-53863-jth-java11
[JENKINS-53863,JENKINS-53863] - Update JTH to 2.41.1 and enable testing with JDK 11
2018-11-16 18:30:50 +01:00
Oleg Nenashev 6cf67767b8 [JENKINS-53716] - Introduce JDK8-only tests, move ysoserial tests there 2018-11-14 17:28:48 +01:00
Oleg Nenashev 46824ec45d [JENKINS-53863] - Update JTH to 2.41.1 and enable testing with JDK 11 2018-11-13 18:48:52 +01:00
Jesse Glick b5446558e5 Functions.generateConsoleAnnotationScriptAndStylesheet needs to include the SESSION_HASH in the URL to properly invalidate scripts across restarts. 2018-11-13 12:28:25 -05:00
Kohsuke Kawaguchi e3af0f3bb1 [maven-release-plugin] prepare for next development iteration 2018-11-11 11:23:21 -08:00
Kohsuke Kawaguchi 8b8bcea0d0 [maven-release-plugin] prepare release jenkins-2.151 2018-11-11 11:23:13 -08:00
Kohsuke Kawaguchi e8d38bc4e9 [maven-release-plugin] prepare for next development iteration 2018-11-08 16:57:49 -08:00
Kohsuke Kawaguchi f7c10b8ca5 [maven-release-plugin] prepare release jenkins-2.138.3 2018-11-08 16:57:42 -08:00
Baptiste Mathus 131794b84d Merge pull request #3648 from MRamonLeon/JENKINS-27177
[JENKINS-27177] Add disable plugin command and tests
2018-11-08 13:04:13 +01:00
Jesse Glick 498114e872 Work around SUREFIRE-1588. 2018-11-07 16:07:08 -05:00
Francisco Fernández f6ef70a8d4 [JENKINS-54310] java.io.IOException: Stream is closed when the CLI has not read entirely the input (#3708)
* [JENKINS-54310] read the input at once

* [JENKINS-54310] reading as String

* [JENKINS-54310] Change the approach for those CLI that open a shell
2018-11-07 10:08:52 +03:00
Kohsuke Kawaguchi 6705bdbf59 [maven-release-plugin] prepare for next development iteration 2018-11-04 14:08:18 -08:00
Kohsuke Kawaguchi c9fb0cabab [maven-release-plugin] prepare release jenkins-2.150 2018-11-04 14:08:09 -08:00
Kohsuke Kawaguchi 0f0778b213 [maven-release-plugin] prepare for next development iteration 2018-10-28 13:16:03 -07:00
Kohsuke Kawaguchi e158482c02 [maven-release-plugin] prepare release jenkins-2.149 2018-10-28 13:15:49 -07:00