[JENKINS-34561] Support for configuring the Jenkinsfile location/name #44

dbut023 · 2016-12-15T12:50:32Z

Adds support to configure the location and name of the Jenkinsfile.

I've tested it with both different file names and sticking Jenkinsfile in a subfolder; my test-multibranch repo shows the test scenarios.

One thing I haven't got working is have the descriptor in SCMBinder return the configured script path as part of its display name.


        Merge pull request #1 from jenkinsci/master

bring up to date


        Merge pull request #2 from jenkinsci/master

.


        Support configuring the name of the jenkinsfile script


        Refactor WorkflowBranchProjectFactory to extend the generalised confi…

…gurable factory


        Clean up messages.


        Remove stray //


        Fix findbugs warning and fix up usage of field.

jglick · 2016-12-16T16:18:49Z

IIRC there is already a plugin that does something much like this; would prefer to keep this plugin simple and add extended behaviors there.

kuhnroyal · 2016-12-16T16:59:10Z

I basically have a similar patch in use currently, if there is another plugin that can intgerate here I have not found it. Would be nice though.

jglick · 2016-12-16T20:46:04Z

https://github.com/jenkinsci/pipeline-multibranch-defaults-plugin

leewinder · 2016-12-21T11:39:12Z

What's the expectation of getting this pull request merged in? The other plug-in (with defaults) doesn't really perform the same behaviour, it simply allows you to specify another (and only one other) file which could be used.

It doesn't allow us to define different names and paths for the Jenkinsfile in branch builds.

Adds a significant and powerful element to this plug-in.


        Merge branch 'master' of github.com:jenkinsci/workflow-multibranch-pl…

…ugin # Conflicts: # src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory.java Conflict fixed into refactor

dbut023 · 2016-12-21T12:35:21Z

Lee's mirrored my thoughts too. I'm not seeing how this PR slots in with the functionality of multibranch-defaults.

kuhnroyal · 2016-12-21T12:51:41Z

I have to agree, the multibranch-defaults-plugin doesn't solve my problems.

vtintillier · 2017-01-07T09:20:06Z

So is there anything that prevents merging this PR?

leewinder · 2017-01-10T21:08:54Z

workflow-multibranch.hpi.zip

For those needing this, I built @dbut023's repo so I could use the config option. Just download and unzip the above hpi file, and upload it to Jenkins manually.

Make sure you've installed the official version first as manually uploading it won't sort out the dependancies.

I added a stupid verison number (100.0.0) so updates to the official release won't override it, but obviously there's no fixes going into that if new official release are done without this pull request being merged in...

y3ti · 2017-01-12T15:56:22Z

Other arguments for merge this patch:

Normal (not multibranch) pipeline job provides this functionality. We can set "Script Path" and change the default value (Jenkinsfile).
There is an issue in Jenkins's Jira: https://issues.jenkins-ci.org/browse/JENKINS-39861

crummy · 2017-01-13T16:45:45Z

This is a very useful feature for monorepos. Hoping to see it merged.

matejsp · 2017-01-16T17:30:10Z

Is there any reason for this to not be merged?
It's the killer feature for multiproduct git repos.

psufoxman · 2017-01-20T19:03:07Z

I will add my vote as well to have this merged. Would like to have this on the open source.

teramawi · 2017-01-27T12:10:02Z

Voted for this pull request as I am feeling quite limited in multibranch pipeline usage.

Currently I'm using a workaround as mentioned in the manual loading documentation but with the pipeline model definition coming up this workaround does no longer work.

One cannot use the groovy dsl to load another Jenkinsfile and use the model definition dsl there.
I'd greatly appreciate it, if this feature could find its way into the plugin.

malinoff · 2017-01-27T13:55:05Z

I can describe an other use-case: I'd like to keep my project root simple and clean, all dirty ops-related stuff goes into ops-tools directory (including Jenkinsfile, of course).

dedalusj · 2017-02-20T22:22:27Z

Any chance this pull request is going to be merged?

There have been a few use cases already outlined in the comments.

konetzed · 2017-02-24T21:14:29Z

Is there anyway with this add on to have jenkins create multiple jobs based off a directory structure like below

repo/dir1
     dir2
     dir3 
     dirN

Where each dir would have its own Jenkinsfile but the branch would still be just master?

If not does someone know a better way of doing that?
Thanks

ajohnstone · 2017-02-25T13:41:16Z

@konetzed that would be awesome, this is one of the larger issues I have with using jenkinsfiles. A single repo needing multiple jobs. I think you can generate new jobs from a jenkinsfile.

zloylos · 2017-03-03T16:29:32Z

This is very important and useful feature for many people.
@jglick can u merge it, please?

jglick

Concept is fine but the implementation is all wrong, I am afraid. I would need to rewrite from scratch.

jglick · 2017-03-03T19:10:26Z

src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory.java

-            }
-        };
+    @DataBoundConstructor public WorkflowBranchProjectFactory() {
+        super(SCRIPT);


Does not make any sense to have two implementation classes.

jglick · 2017-03-03T19:10:26Z

src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProject.java

    }

    @Extension public static class DescriptorImpl extends MultiBranchProjectDescriptor implements IconSpec {

+        @DataBoundConstructor public DescriptorImpl(){


Does not make any sense.

jglick · 2017-03-03T19:10:26Z

src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectFactory.java

+
+        public DescriptorImpl(){}
+
+        @DataBoundConstructor public DescriptorImpl(AbstractWorkflowBranchProjectFactory factory){


jglick · 2017-03-03T19:10:26Z

src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProject.java

@@ -56,20 +57,27 @@

    private static final Logger LOGGER = Logger.getLogger(WorkflowMultiBranchProject.class.getName());

-    public WorkflowMultiBranchProject(ItemGroup parent, String name) {
+    @DataBoundConstructor


This is also wrong.

Hello @jglick: would it be possible to elaborate on how it should be handled instead?


        Merge branch 'master' of github.com:jenkinsci/workflow-multibranch-pl…

…ugin # Conflicts: # src/main/java/org/jenkinsci/plugins/workflow/multibranch/AbstractWorkflowMultiBranchProjectFactory.java # src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMBinder.java


        Clean out.


        Reworked to simplify the implementation.

dbut023 · 2017-03-13T09:56:56Z

Closing this PR in preference to PR#59

dbut023 added 7 commits Nov 9, 2016

Merge pull request #1 from jenkinsci/master

1e60b71

bring up to date

Merge pull request #2 from jenkinsci/master

f5f47c8

.

Support configuring the name of the jenkinsfile script

3a64888

Refactor WorkflowBranchProjectFactory to extend the generalised confi…

613caf7

…gurable factory

Clean up messages.

cd5a218

Remove stray //

Loading status checks…

d87264e

Fix findbugs warning and fix up usage of field.

Loading status checks…

ee33995

Merge branch 'master' of github.com:jenkinsci/workflow-multibranch-pl…

Loading status checks…

88be953

…ugin # Conflicts: # src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory.java Conflict fixed into refactor

stephenc force-pushed the jenkinsci:master branch from 02877f7 to 973fc79 Jan 16, 2017

jglick requested changes Mar 3, 2017

View changes

dbut023 added 2 commits Mar 9, 2017

Merge branch 'master' of github.com:jenkinsci/workflow-multibranch-pl…

b039c51

…ugin # Conflicts: # src/main/java/org/jenkinsci/plugins/workflow/multibranch/AbstractWorkflowMultiBranchProjectFactory.java # src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMBinder.java

Clean out.

7fd422b

marvinthepa mentioned this pull request Mar 10, 2017

[JENKINS-34561] Make Jenkinsfile filename configurable #59

Merged

Reworked to simplify the implementation.

Loading status checks…

c64c137

dbut023 closed this Mar 13, 2017

jenkinsci / workflow-multibranch-plugin

[JENKINS-34561] Support for configuring the Jenkinsfile location/name #44

[JENKINS-34561] Support for configuring the Jenkinsfile location/name #44

dbut023 commented Dec 15, 2016

jglick commented Dec 16, 2016

kuhnroyal commented Dec 16, 2016

jglick commented Dec 16, 2016

leewinder commented Dec 21, 2016

dbut023 commented Dec 21, 2016

kuhnroyal commented Dec 21, 2016

vtintillier commented Jan 7, 2017 •

edited

leewinder commented Jan 10, 2017

y3ti commented Jan 12, 2017

crummy commented Jan 13, 2017

matejsp commented Jan 16, 2017

psufoxman commented Jan 20, 2017

teramawi commented Jan 27, 2017

malinoff commented Jan 27, 2017

dedalusj commented Feb 20, 2017

konetzed commented Feb 24, 2017 •

edited

ajohnstone commented Feb 25, 2017

zloylos commented Mar 3, 2017

jglick left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

dbut023 commented Mar 13, 2017


		public DescriptorImpl(){}

		@DataBoundConstructor public DescriptorImpl(AbstractWorkflowBranchProjectFactory factory){

jenkinsci / workflow-multibranch-plugin

Join GitHub today

[JENKINS-34561] Support for configuring the Jenkinsfile location/name #44

[JENKINS-34561] Support for configuring the Jenkinsfile location/name #44

Conversation

dbut023 commented Dec 15, 2016

jglick commented Dec 16, 2016

kuhnroyal commented Dec 16, 2016

jglick commented Dec 16, 2016

leewinder commented Dec 21, 2016

dbut023 commented Dec 21, 2016

kuhnroyal commented Dec 21, 2016

vtintillier commented Jan 7, 2017 • edited

leewinder commented Jan 10, 2017

y3ti commented Jan 12, 2017

crummy commented Jan 13, 2017

matejsp commented Jan 16, 2017

psufoxman commented Jan 20, 2017

teramawi commented Jan 27, 2017

malinoff commented Jan 27, 2017

dedalusj commented Feb 20, 2017

konetzed commented Feb 24, 2017 • edited

ajohnstone commented Feb 25, 2017

zloylos commented Mar 3, 2017

jglick left a comment

This comment has been minimized.

jglick Mar 3, 2017

This comment has been minimized.

jglick Mar 3, 2017

This comment has been minimized.

jglick Mar 3, 2017

This comment has been minimized.

jglick Mar 3, 2017

This comment has been minimized.

marvinthepa Mar 10, 2017

dbut023 commented Mar 13, 2017

vtintillier commented Jan 7, 2017 •

edited

konetzed commented Feb 24, 2017 •

edited