Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support to configure projectFactories for organization folders #1043

Merged
merged 2 commits into from
Oct 5, 2017
Merged

Add support to configure projectFactories for organization folders #1043

merged 2 commits into from
Oct 5, 2017

Conversation

mkobit
Copy link
Contributor

@mkobit mkobit commented Jul 26, 2017

issue: https://issues.jenkins-ci.org/browse/JENKINS-45528

Notes

  • Disabled test because I don't know the right way to implement the clearing use case

@daspilker
Copy link
Member

Is this still WIP? I guess by "clearing use case" you mean overriding or clearing the default WorkflowMultiBranchProjectFactory project factory. I think it would make sense if calling projectFactory would delete any previously set project factories and add the ones being configured with the call. That would make the behavior different to e.g. steps which always adds new steps, but e.g. scm will also replaces any existing SCM configuration.

daspilker
daspilker requested changes Aug 27, 2017
View reviewed changes
job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/jobs/OrganizationFolderJob.groovy Outdated
@@ -16,6 +17,8 @@ class OrganizationFolderJob extends ComputedFolder {

/**
* Sets the organizations in this folder.
*
* @since 1.58
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to copy the version from class level.

job-dsl-core/src/main/resources/javaposse/jobdsl/dsl/jobs/OrganizationFolderJob-template.xml Outdated
@@ -25,6 +25,8 @@
<triggers/>
<navigators/>
<projectFactories>
<org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectFactory/>
<org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectFactory>
<scriptPath>Jenkinsfile</scriptPath>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

leave the default config as it is for backwards compatibility

@mkobit
Copy link
Contributor Author

mkobit commented Aug 28, 2017

Thanks @daspilker , that is the feedback I was looking for. I'll take another stab at this in the next few days.

@mkobit
Switch OrganizationFolderJob-template back for backwards compatibil…
aa8ce31 
…ity and clear the `projectFactories` when configuring them
@mkobit mkobit changed the title WIP: Add support to configure projectFactories for organization folders Add support to configure projectFactories for organization folders Sep 9, 2017
@mkobit
Copy link
Contributor Author

mkobit commented Sep 9, 2017

I think I've made the changes you requested and think this is ready for another round of review.

@daspilker daspilker merged commit aa8ce31 into jenkinsci:master Oct 5, 2017
@mkobit mkobit deleted the org-folder-project-factories branch October 5, 2017 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daspilker daspilker daspilker requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mkobit @daspilker