Details
-
Bug
-
Status: Resolved (View Workflow)
-
Minor
-
Resolution: Fixed
-
None
Description
The automatic rebase from an upstream job should not actually execute, during any of the configured steps, unless the "This project builds a Subversion feature branch" option is checked and configured with an upstream project.
The job that is the one from which feature branches are built fails on this step due to it not having an upstream project configured. However we configure the rule to make sure the new jobs automatically have it enabled and configured.
Attachments
Activity
Hugues Chabot
added a comment - After investigation, manual rebase and integrate action are unavailable if the project does not build a Subversion feature branch. Therefore, it makes sense to skip the automatic rebase action in that case. Furtheremoe, it is consistent with the documentation which states that This works in conjunction with the "This project builds a Subversion feature branch" checkbox above.
Hugues Chabot
added a comment - After investigation, manual rebase and integrate action are unavailable if the project does not build a Subversion feature branch. Therefore, it makes sense to skip the automatic rebase action in that case. Furtheremoe, it is consistent with the documentation which states that This works in conjunction with the "This project builds a Subversion feature branch" checkbox above . Code changed in jenkins
User: Hugues Chabot
Path:
src/main/java/jenkins/plugins/svnmerge/RebaseBuilder.java
http://jenkins-ci.org/commit/svnmerge-plugin/5880b5ac00187d7bf0744f69441342b0124b05ea
Log:
[FIXED JENKINS-23393] Skip rebase on main branch
Skip automatic rebase action when the project does not build a Subversion feature branch.
This is a configuration error. I don't think it is correct to quietly ignore it.
However, it is possible to add a global settings for the plugin (e.g. "Skip rebase/integration action when upstream is undefined")