summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix Authorization Matrix property - inheritance strategy"master-patchesZuul2020-07-176-22/+43
|\
| * Fix Authorization Matrix property - inheritance strategyAdam Romanek2020-07-156-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until now <inheritanceStrategy> tag was only added to jobs-in-a-folder and folder configs. In JJB the tag's class is always set to "InheritParentStrategy" which according to the docs means the "item will inherit its parent items permissions". Apparently <inheritanceStrategy> tag needs to be present on top-level jobs also. For top-level jobs setting the tag's class value to "InheritParentStrategy" means the job "will inherit the global security security settings" and this is the default behavior. The code has simplified a bit - if it's a folder then we use a different property name for authorization matrix property, other than that the code is the same for all three "variants": folder, job-in-a-folder and job-outside-a-folder (top-level job). Also this change fixes the missing <inheritanceStrategy> tag for job-in-a-folder, where the folder name was specified as part of the "name" key instead of the standalone "folder" key. With this change we no longer check if a job is in a folder or not, so it's implicitly fixed. Added a test case to catch potential regressions in the future. The copyright notice reflects this and the previous contribution in this module. Change-Id: I84b22c09c8a107aab2b4eca20feffc9b61675a92
* | Merge "Updated GHPRB plugin support"Zuul2020-07-159-34/+129
|\ \
| * | Updated GHPRB plugin supportEren ATAS2020-07-079-34/+129
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented the following tags that have been missing: - displayBuildErrorsOnDownstreamBuilds - blackListCommitAuthor - GhprbCommentFile - GhprbNoCommitStatus Following tags are printed when the value of the key is empty: - whiteListTargetBranches - blackListTargetBranches - buildDescTemplate - triggeredStatus - startedStatus - statusUrl - addTestResults Also updated tests Change-Id: I1e19841d88728af9ac6aa9e1c78f89fe962a583f Signed-off-by: Eren ATAS <eatas.contractor@libertyglobal.com>
* | Merge "Removed the unnecessary empty combinationFilter Tag"Zuul2020-07-1515-20/+4
|\ \
| * | Removed the unnecessary empty combinationFilter TagEren ATAS2020-07-0715-20/+4
| |/ | | | | | | | | | | | | | | | | In the current implementation, jjb creates an empty combinationFilter tag whenever there is `executionStrategy`. This empty tag should not appear. Change-Id: I2bf25ae58d12904ce0a00e0a5cfefbf27d9451ad Signed-off-by: Eren ATAS <eatas.contractor@libertyglobal.com>
* | Merge "Custom __deepcopy__ for LazyLoader"Zuul2020-07-151-0/+6
|\ \
| * | Custom __deepcopy__ for LazyLoaderDmitry Teselkin2020-06-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running JJB under py3 (py3.6) it started to fail with exception TypeError: cannot serialize '_io.BufferedReader' object This is happens when doing deepcopy of a LazyLoader object which contains an instance of BufferedReader object. Under py2 this works but under py3 it is not. This commit adds custom __deepcopy__ method to LazyLoader that avoids deepcopy of a self._loader. Change-Id: I00844fc06ebf84538d557c33f1179a26cb18202f Story: 2007227
* | | Merge "publishers: add "threshold" support to join-trigger"Zuul2020-07-153-0/+36
|\ \ \
| * | | publishers: add "threshold" support to join-triggerDavid Aguilar2020-06-233-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The joinTrigger plugin now accepts a resultThreshold field instead of the evenIfDownstreamUnstable boolean. Add support for a "threshold" yaml field to manage this value. Change-Id: I60ba999b963709a76854a4d50387d2b1eefae05f Signed-off-by: David Aguilar <davvid@gmail.com>
* | | | Merge "publishers: deprecate "evenIfDownstreamUnstable" in join-trigger"Zuul2020-07-151-4/+5
|\| | |
| * | | publishers: deprecate "evenIfDownstreamUnstable" in join-triggerDavid Aguilar2020-06-231-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only emit the joinTrigger evenIfDownstreamUnstable property when it has been configured. This property is no longer presented in newer version of the join plugin, and has been replaced with a result threshold. Mark the boolean as deprecated. Change-Id: If87517330ebbef17146b20f47689a29f8417b20e Signed-off-by: David Aguilar <davvid@gmail.com>
* | | | Merge "publishers: refactor out a helpers.trigger_threshold() helper"Zuul2020-07-152-11/+24
|\| | |
| * | | publishers: refactor out a helpers.trigger_threshold() helperDavid Aguilar2020-06-232-11/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic698dc7a5f0952e5a7a4fef3350959b3d4f72d45 Signed-off-by: David Aguilar <davvid@gmail.com>
* | | | Merge "Implement disable discover_pr_origin"Zuul2020-07-153-12/+79
|\ \ \ \
| * | | | Implement disable discover_pr_originRotaru Sergey2020-06-143-12/+79
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In my opinion the best choise for default value of discover_pr_origion is not specified(None value) like it is done for bitbucket scm. Currently there is no way to disable this option for github scm. Added false value as one of valid value for this option, like is done for discover-pr-fork-strategy. In fact any of yaml specification false implementation should work. Change-Id: Ibc26d6b5c39b5455160ba5c84be99575b79fc102
* | | | Merge "Implement GitHub PR Comment Build Plugin"Zuul2020-07-153-1/+74
|\ \ \ \
| * | | | Implement GitHub PR Comment Build PluginSergey Rotaru2020-06-143-1/+74
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support of trigger-build-on-pr-comment, trigger-build-on-pr-rewiev, trigger-build-on-pr-update options for multibranch project. Modified multibranch test case to cover new options. Change-Id: Ia8658b49e7f7806ef1a8f34de10eaee5b3b7b488 Signed-off-by: Rotaru Sergey <badwings@yandex.ru>
* | | | Merge "Implement script-id for multibranch with default."Zuul2020-07-155-16/+150
|\ \ \ \ | |_|_|/ |/| | |
| * | | Implement script-id for multibranch with default.Rotaru Sergey2020-06-155-16/+150
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main feature to use multibranch with defaults project type is build configuration mode with default groovy script stored in global Jenkins store provided by config-file provider plugin. Options "script-id" and "sandbox" fully implements this feature. Besides both project type support "script-path" and "script-id" mode. It may be convenient to switch mode without changing project type in order to save project history. Change-Id: I4cd62e69c9abe7d8fc2e0dfdbe25d8b07ddf51c5
* | / Added topic-changed-event on triggers.pyEren ATAS2020-06-193-1/+93
| |/ |/| | | | | | | | | | | Depends on https://review.opendev.org/#/c/731169/ Change-Id: I8d1ed67b11e1ff1fcf13325108c007d6baff07c4 Signed-off-by: Eren ATAS <eatas.contractor@libertyglobal.com>
* | Merge "Gerrit Trigger: update support to the latest plugin version"Zuul2020-06-1853-57/+875
|\ \ | |/ |/|
| * Gerrit Trigger: update support to the latest plugin versionAdam Romanek2020-06-0153-57/+875
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes include: - deprecated the following options and made support for them dependent on the Gerrit Trigger plugin version: - 'no-name-and-email' - 'readable-message' - 'trigger-for-unreviewed-patches' - added a set of new options: - 'name-and-email-parameter-mode' (replaced 'no-name-and-email') - 'commit-message-parameter-mode' (replaced 'readable-message') - 'change-subject-parameter-mode' - 'comment-text-parameter-mode' all these options can have one of the following values: - NONE - PLAIN - BASE64 the default value for the first two options is taken from the respective options they replaced, if they exist in the input YAML file, so the overall change should be backward compatible - fixed the value generated for <dynamicTriggerConfiguration> element it should be "true"/"false" instead of "True"/"False" - added an empty <dynamicGerritProjects> element when dynamic trigger functionality is disabled to match what the plugin does With the above changes the markup generated by JJB is fully aligned with Gerrit Trigger plugin v2.30.x. Tested on Gerrit Trigger plugin v2.30.0. Task: 39871 Story: 2007722 Change-Id: I25800874f51a93a351926a9a1be255cce80b88bd
* | Gradle plugin: Support parameter passingBen Douglas2020-06-013-0/+10
|/ | | | | | | Introduce 2 booleans in the Gradle builder section to support passing parameters by System Properties and Project Properties Change-Id: I0de1e20b85902263e0d83ccadd64d42fc2b37193
* Merge "Introduce disable-host-key-checking for builder ansible-playbook"Zuul2020-05-269-7/+59
|\
| * Introduce disable-host-key-checking for builder ansible-playbookChristian Kanthak2020-05-159-7/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented new parameter "disable-host-key-checking" to make the "anbile-playbook" builder compatible with version >=1.0 of the ansible plugin. The parameter defaults to "false" for security reasons (as the plugin does). The old parameter "host-key-checking" is still written to XML to keep code working in a setup with plugin version <1.0. This has no impact on newer setups because the plugin with version >=1.0 ignores the old parameter value. For same security reasons the default value of old parameter "host-key-checking" was changed to "true" to "fix" older setups which have the parameter not defined. Change-Id: I4a592c1a4d6ba8bb4f365ce505296cf5c09f7e19 Task: 39789 Story: 2007678
* | Merge "Pipelines: stop producing unsupported and deprecated XML tags"Zuul2020-05-2516-99/+134
|\ \
| * | Pipelines: stop producing unsupported and deprecated XML tagsAdam Romanek2020-05-2516-99/+134
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes include: - <concurrentBuild> should now be represented as <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/> property - <triggers> should now be localed inside <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty> property, in <properties> section - unsupported XML elements got removed: - <blockBuildWhenDownstreamBuilding> - <blockBuildWhenUpstreamBuilding> - <assignedNode> - <canRoam> - <customWorkspace> - got rid of publishers from project_pipeline_template005.{xml,yaml} as these are not supported in Pipeline jobs The above changes align the produced XMLs with the ones from Jenkins 2.190.1 and Pipeline plugin v2.6. Task: 39836 Story: 2007708 Change-Id: I650ef2ee60e872cce8f93de5f391933d68ec81f0
* | Added trim option for String parameter.Igor Lakhtenkov2020-05-228-1/+52
| | | | | | | | | | Task: #22637 Change-Id: Ic2722aac586d3911e3ff5ab4c2d3c5a7a03fa14e
* | Merge "Added missing 'BuiltOn' column for views"Zuul2020-05-183-0/+5
|\ \
| * | Added missing 'BuiltOn' column for viewsSergey Lebedev2020-05-183-0/+5
| |/ | | | | | | | | | | Plugin home - https://plugins.jenkins.io/built-on-column/ Change-Id: I7fd27add618772fe3835f5f4fd4ef30c097b781d
* / Added missing 'Favorite' column for viewsSergey Lebedev2020-05-183-0/+3
|/ | | | | | Plugin home - https://plugins.jenkins.io/favorite/ Change-Id: Ibfaf64721fa25c19812c90c79d12ab82b31451aa
* Fix Authorization Matrix property support on jobs in a folderAdam Romanek2020-05-133-7/+40
| | | | | | | | | | | | | | | | | Without the fix: > 2020-05-11 10:56:12.238+0000 [id=29522] WARNING > o.e.j.s.h.ContextHandler$Context#log: Error while serving http://localhost/job/someFolder/createItem > java.lang.ClassCastException: com.cloudbees.hudson.plugins.folder.properties.AuthorizationMatrixProperty cannot be cast to hudson.model.JobProperty It turns out com.cloudbees.hudson.plugins.folder.properties.AuthorizationMatrixProperty should only be applied to Folders, not Jobs. The latter should use hudson.security.AuthorizationMatrixProperty. Task: 39760 Story: 2007666 Change-Id: I64907265b214fb1e489e1e657a30c90d6ee08c3f
* Add "upstream-committers" to publisher "email-ext"Christian Kanthak2020-05-043-0/+56
| | | | | | | | | | Add support for the recipient item "Upstream Committers" of the "Send To" list of a trigger of the "Email Extension" (email-ext) plugin. Change-Id: Iaa77330bb1910881df154494b0472ce21ea28d99 Task: 39595 Story: 2007607
* Merge "Add parameter "cancel-pending-builds-on-update" for trigger "gitlab""Zuul2020-04-2011-0/+13
|\
| * Add parameter "cancel-pending-builds-on-update" for trigger "gitlab"Christoph Erhardt2020-04-1611-0/+13
| | | | | | | | | | | | | | When this boolean parameter is set to true, updating a merge request cancels any pending merge-request builds. Change-Id: Ic5ef400cf4cd088680b92bd10b88b79520795729
* | Merge "modules/properties: Multibranch projects have folder structure"Zuul2020-04-171-0/+2
|\ \
| * | modules/properties: Multibranch projects have folder structureMatt Kucia2020-03-241-0/+2
| |/ | | | | | | | | | | | | | | | | Without this change, multibranch project creation with authorization parameter would fail with hudson.security.AuthorizationMatrixProperty cannot be cast to com.cloudbees.hudson.plugins.folder.AbstractFolderProperty Change-Id: Ie83355705f0526f2984eca0e5f1f80fba8b1ba5f
* / Blacklist stestr 3.0.0Antoine Musso2020-04-171-1/+1
|/ | | | | | | | | | stestr 3.0.0 does not support python 2.7 but has been released without the proper metadata to reflect that. As a result, there is a python2 wheel stestr-3.0.0-py2-none-any.whl which get picked up. Blacklist stestr 3.0.0 to fix '--list': no such option error Change-Id: I11898e1021973fa4c3031f1388d58d868feb601a
* Add execute-on parameter for post build stepsArtem Nikitin2020-03-123-1/+46
| | | | | | | | | | | executeOn setting is available for PostBuildStep since 2.0 version of the Post Build Script plugin. For previous plugin's version executeOn should be set on the PostBuildScript layer. Change-Id: I6b7c9ccfbd0a2d610499074675835e6b5d96cb17 Task: 39028 Story: 2007411
* Fix zuul parameters anchor linkThanh Ha2020-03-121-1/+1
| | | | | Change-Id: Ie8e3b07d903b45f4d407a00e5433b02cb4a43eaa Signed-off-by: Thanh Ha <zxiiro@gmail.com>
* Merge "Add support for become in ansible playbook"Zuul2020-03-046-0/+39
|\
| * Add support for become in ansible playbookMichal Ovciarik2020-02-256-0/+39
| | | | | | | | Change-Id: Ia116f715042d4a4c8cc26ac45cf1a91be47435d3
* | Merge "conditional-publisher: sort publisher attributes alphabetically"Zuul2020-03-041-0/+6
|\ \
| * | conditional-publisher: sort publisher attributes alphabeticallyKen Dreyer2020-02-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described in dc83d5161fd58c22018c0355282f98c9c2369035, Python 3.8's ElementTree now writes out attributes in insertion order. On older Python versions, ElementTree writes attributes in alphabetical order instead. The conditional_publisher() method takes an existing publisher XML node and alters it by changing the tag name to "publisher" and adding a new "class" attribute with the original tag name. ElementTree on py38 preserves the insertion order of the "class" attribute, whereas py37 and earlier would have sorted "class" ahead of the other attributes. This leads to a unit test failure on Python 3.8 in publishers/fixtures/conditional-publisher002.yaml. The conditional "copy-to-master" publisher has a "plugin" attribute in the XML. On py37, the "class" attribute sorted before the "plugin" attribute alphabetically, but on py38+, "plugin" was inserted before "class", so the order is effectively reversed. To resolve the test failure, sort the attributes alphabetically when we modify edited_node. This makes py38 write the edited_node attributes in the same order as older Pythons. With this change, the test suite passes when comparing the JJB output with the static XML fixture file. Change-Id: Ib727365e101507d9ab69a426bb0bda89a402fb08
* | | Adding view for the Delivery Pipeline PluginJiri Tyr2020-02-079-0/+339
| | | | | | | | | | | | | | | Change-Id: I8a9a71267562734b078b7260c79d299db7fb4e2b Signed-off-by: Jiri Tyr <jiri.tyr@gmail.com>
* | | Merge "Ignore py:obj warnings and fail on warnings"Zuul2020-02-079-78/+92
|\ \ \ | |/ / |/| |
| * | Ignore py:obj warnings and fail on warningsThanh Ha2020-01-229-78/+92
| | | | | | | | | | | | | | | | | | | | | | | | * Enables fail on warnings and enable nitpicky * Consolidate string -> str for args Change-Id: Id5c29d48813fd6f772816dc74c7c4e408097113d Signed-off-by: Thanh Ha <zxiiro@gmail.com>
* | | Merge "Fix some typos in documentation"Zuul2020-02-043-4/+4
|\ \ \
| * | | Fix some typos in documentationMattia Rizzolo2020-02-033-4/+4
| |/ / | | | | | | | | | | | | Change-Id: I67d82228bb37b8b4634c07e76a421964e227c3cb Signed-off-by: Mattia Rizzolo <mattia@mapreri.org>