Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-45322

Orphaned MultiBranchProject not properly disabled

XMLWordPrintable

      When a branch project is orphaned, setBranch(Branch.Dead) is called, which causes it to appear in strikethrough text in its view (ItemColumn/column.jelly); be deletable (BranchJobProperty.decorateACL); and suppress new builds (BranchJobProperty.isBuildable).

      None of this seems to work in the case that the whole repository folder is orphaned. Based on my readings of the above implementations, it would suffice for ProjectNameProperty to include a new orphaned field (or perhaps this deserves to be a new AbstractFolderProperty<MultiBranchProject<?, ?>>); OrganizationFolder to override orphanedItems to set this field, then set Branch.Dead on all existing branch projects; all other code which might add branch projects (reindexing or event support) to also set Branch.Dead when this flag is set; and make MultiBranchProject.getACL not suppress Item.DELETE when orphaned.

          [JENKINS-45322] Orphaned MultiBranchProject not properly disabled

          Stephen Connolly added a comment -

          jglick thanks for filing this, I had come to the same conclusion earlier today but just didn't have time to create the ticket

          Stephen Connolly added a comment - jglick thanks for filing this, I had come to the same conclusion earlier today but just didn't have time to create the ticket

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          src/images/folder-disabled.svg
          src/main/java/com/cloudbees/hudson/plugins/folder/Folder.java
          src/main/webapp/images/16x16/folder-disabled.png
          src/main/webapp/images/24x24/folder-disabled.png
          src/main/webapp/images/32x32/folder-disabled.png
          src/main/webapp/images/48x48/folder-disabled.png
          http://jenkins-ci.org/commit/cloudbees-folder-plugin/9e0b0ed41879879ed1f81913ef328173db316fb6
          Log:
          JENKINS-45322 Add icon for a disabled folder

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: src/images/folder-disabled.svg src/main/java/com/cloudbees/hudson/plugins/folder/Folder.java src/main/webapp/images/16x16/folder-disabled.png src/main/webapp/images/24x24/folder-disabled.png src/main/webapp/images/32x32/folder-disabled.png src/main/webapp/images/48x48/folder-disabled.png http://jenkins-ci.org/commit/cloudbees-folder-plugin/9e0b0ed41879879ed1f81913ef328173db316fb6 Log: JENKINS-45322 Add icon for a disabled folder

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          pom.xml
          http://jenkins-ci.org/commit/cloudbees-folder-plugin/7364a39cf696ed4111e52c74063aba8d85cbdcef
          Log:
          JENKINS-45322 New API so towards 6.1.0

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: pom.xml http://jenkins-ci.org/commit/cloudbees-folder-plugin/7364a39cf696ed4111e52c74063aba8d85cbdcef Log: JENKINS-45322 New API so towards 6.1.0

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolder.java
          src/main/java/com/cloudbees/hudson/plugins/folder/FolderJobQueueDecisionHandler.java
          src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly
          src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.properties
          src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/help-disable.html
          src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.jelly
          src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.properties
          http://jenkins-ci.org/commit/cloudbees-folder-plugin/e0014184c2ffe63fe508ff4f74d306702db078f0
          Log:
          JENKINS-45322 Add API support for disabled folders

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolder.java src/main/java/com/cloudbees/hudson/plugins/folder/FolderJobQueueDecisionHandler.java src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.properties src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/help-disable.html src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.jelly src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.properties http://jenkins-ci.org/commit/cloudbees-folder-plugin/e0014184c2ffe63fe508ff4f74d306702db078f0 Log: JENKINS-45322 Add API support for disabled folders

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          src/main/java/com/cloudbees/hudson/plugins/folder/computed/DefaultOrphanedItemStrategy.java
          http://jenkins-ci.org/commit/cloudbees-folder-plugin/54b133aff36846354db2f1d0127a9e6c7a08a3fe
          Log:
          JENKINS-45322 The orphaned item strategy should be aware of last computation times and prefer retention of recently disabled items over previously disabled items

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: src/main/java/com/cloudbees/hudson/plugins/folder/computed/DefaultOrphanedItemStrategy.java http://jenkins-ci.org/commit/cloudbees-folder-plugin/54b133aff36846354db2f1d0127a9e6c7a08a3fe Log: JENKINS-45322 The orphaned item strategy should be aware of last computation times and prefer retention of recently disabled items over previously disabled items

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          src/main/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolder.java
          src/test/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolderTest.java
          http://jenkins-ci.org/commit/cloudbees-folder-plugin/f49b3b4e1e0250d004cefd5a7cdd40816f7fa594
          Log:
          JENKINS-45322 Computed folders should support being disabled (as they have the concept of "building")

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: src/main/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolder.java src/test/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolderTest.java http://jenkins-ci.org/commit/cloudbees-folder-plugin/f49b3b4e1e0250d004cefd5a7cdd40816f7fa594 Log: JENKINS-45322 Computed folders should support being disabled (as they have the concept of "building")

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          src/test/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolderTest.java
          http://jenkins-ci.org/commit/cloudbees-folder-plugin/5610dba4bde1c72e90664c3b943aa253f0bdca04
          Log:
          JENKINS-45322 Update test assumptions to reflect disabled folders not building

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: src/test/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolderTest.java http://jenkins-ci.org/commit/cloudbees-folder-plugin/5610dba4bde1c72e90664c3b943aa253f0bdca04 Log: JENKINS-45322 Update test assumptions to reflect disabled folders not building

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          pom.xml
          src/images/folder-disabled.svg
          src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolder.java
          src/main/java/com/cloudbees/hudson/plugins/folder/Folder.java
          src/main/java/com/cloudbees/hudson/plugins/folder/FolderJobQueueDecisionHandler.java
          src/main/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolder.java
          src/main/java/com/cloudbees/hudson/plugins/folder/computed/DefaultOrphanedItemStrategy.java
          src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly
          src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.properties
          src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/help-disable.html
          src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.jelly
          src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.properties
          src/main/webapp/images/16x16/folder-disabled.png
          src/main/webapp/images/24x24/folder-disabled.png
          src/main/webapp/images/32x32/folder-disabled.png
          src/main/webapp/images/48x48/folder-disabled.png
          src/test/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolderTest.java
          http://jenkins-ci.org/commit/cloudbees-folder-plugin/1dc79b5bb52f56782606bd2edb9953948df8b05e
          Log:
          Merge pull request #101 from stephenc/jenkins-45322

          [FIXED JENKINS-45322] Computed folder should disable orphaned items

          Compare: https://github.com/jenkinsci/cloudbees-folder-plugin/compare/176f0a8f4c43...1dc79b5bb52f

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: pom.xml src/images/folder-disabled.svg src/main/java/com/cloudbees/hudson/plugins/folder/AbstractFolder.java src/main/java/com/cloudbees/hudson/plugins/folder/Folder.java src/main/java/com/cloudbees/hudson/plugins/folder/FolderJobQueueDecisionHandler.java src/main/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolder.java src/main/java/com/cloudbees/hudson/plugins/folder/computed/DefaultOrphanedItemStrategy.java src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.jelly src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/configure.properties src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/help-disable.html src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.jelly src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/view-index-top.properties src/main/webapp/images/16x16/folder-disabled.png src/main/webapp/images/24x24/folder-disabled.png src/main/webapp/images/32x32/folder-disabled.png src/main/webapp/images/48x48/folder-disabled.png src/test/java/com/cloudbees/hudson/plugins/folder/computed/ComputedFolderTest.java http://jenkins-ci.org/commit/cloudbees-folder-plugin/1dc79b5bb52f56782606bd2edb9953948df8b05e Log: Merge pull request #101 from stephenc/jenkins-45322 [FIXED JENKINS-45322] Computed folder should disable orphaned items Compare: https://github.com/jenkinsci/cloudbees-folder-plugin/compare/176f0a8f4c43...1dc79b5bb52f

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          pom.xml
          src/main/java/jenkins/branch/MetadataActionFolderIcon.java
          src/main/java/jenkins/branch/MultiBranchProject.java
          src/main/java/jenkins/branch/OrganizationFolder.java
          http://jenkins-ci.org/commit/branch-api-plugin/cb30f8835508c2ea0d46ecab991f9b209d983715
          Log:
          JENKINS-45322 Prevent event processing when disabled

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: pom.xml src/main/java/jenkins/branch/MetadataActionFolderIcon.java src/main/java/jenkins/branch/MultiBranchProject.java src/main/java/jenkins/branch/OrganizationFolder.java http://jenkins-ci.org/commit/branch-api-plugin/cb30f8835508c2ea0d46ecab991f9b209d983715 Log: JENKINS-45322 Prevent event processing when disabled

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          src/main/java/jenkins/branch/MultiBranchProject.java
          http://jenkins-ci.org/commit/branch-api-plugin/87c261f2aec07b57f3ee396c0170e600954233c9
          Log:
          JENKINS-45322 Avoid getFullName() computation unless required

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: src/main/java/jenkins/branch/MultiBranchProject.java http://jenkins-ci.org/commit/branch-api-plugin/87c261f2aec07b57f3ee396c0170e600954233c9 Log: JENKINS-45322 Avoid getFullName() computation unless required

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          src/main/java/jenkins/branch/OrganizationFolder.java
          http://jenkins-ci.org/commit/branch-api-plugin/7f970b83c1dc3464c3bd25dadddc4748f1a70272
          Log:
          JENKINS-45322 Avoid getFullName() computation unless required

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: src/main/java/jenkins/branch/OrganizationFolder.java http://jenkins-ci.org/commit/branch-api-plugin/7f970b83c1dc3464c3bd25dadddc4748f1a70272 Log: JENKINS-45322 Avoid getFullName() computation unless required

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          pom.xml
          src/main/java/jenkins/branch/MetadataActionFolderIcon.java
          src/main/java/jenkins/branch/MultiBranchProject.java
          src/main/java/jenkins/branch/OrganizationFolder.java
          http://jenkins-ci.org/commit/branch-api-plugin/40370fdd50e9aa8601317a5549ce941d3c2912ee
          Log:
          Merge pull request #106 from stephenc/jenkins-45322

          JENKINS-45322 Prevent event processing when disabled

          Compare: https://github.com/jenkinsci/branch-api-plugin/compare/0608c0690406...40370fdd50e9

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: pom.xml src/main/java/jenkins/branch/MetadataActionFolderIcon.java src/main/java/jenkins/branch/MultiBranchProject.java src/main/java/jenkins/branch/OrganizationFolder.java http://jenkins-ci.org/commit/branch-api-plugin/40370fdd50e9aa8601317a5549ce941d3c2912ee Log: Merge pull request #106 from stephenc/jenkins-45322 JENKINS-45322 Prevent event processing when disabled Compare: https://github.com/jenkinsci/branch-api-plugin/compare/0608c0690406...40370fdd50e9

          Stephen Connolly added a comment -

          Will be released as cloudbees-folders 6.1.0 and branch-api 2.1.0 on Monday

          Stephen Connolly added a comment - Will be released as cloudbees-folders 6.1.0 and branch-api 2.1.0 on Monday

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          src/main/java/jenkins/branch/MultiBranchProject.java
          src/main/java/jenkins/branch/OrganizationFolder.java
          http://jenkins-ci.org/commit/branch-api-plugin/1f39f17d687274d44e63d54fc003ad9338844501
          Log:
          JENKINS-45322 Follow-up to @jglick comments

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: src/main/java/jenkins/branch/MultiBranchProject.java src/main/java/jenkins/branch/OrganizationFolder.java http://jenkins-ci.org/commit/branch-api-plugin/1f39f17d687274d44e63d54fc003ad9338844501 Log: JENKINS-45322 Follow-up to @jglick comments

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          src/main/java/jenkins/branch/MultiBranchProject.java
          src/main/java/jenkins/branch/OrganizationFolder.java
          http://jenkins-ci.org/commit/branch-api-plugin/c0a695746af764b5a917891860dd4ae391fbdbc5
          Log:
          Merge pull request #107 from stephenc/jenkins-45322-follow-up

          JENKINS-45322 Follow-up to @jglick comments

          Compare: https://github.com/jenkinsci/branch-api-plugin/compare/e59651def71c...c0a695746af7

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: src/main/java/jenkins/branch/MultiBranchProject.java src/main/java/jenkins/branch/OrganizationFolder.java http://jenkins-ci.org/commit/branch-api-plugin/c0a695746af764b5a917891860dd4ae391fbdbc5 Log: Merge pull request #107 from stephenc/jenkins-45322-follow-up JENKINS-45322 Follow-up to @jglick comments Compare: https://github.com/jenkinsci/branch-api-plugin/compare/e59651def71c...c0a695746af7

            stephenconnolly Stephen Connolly
            jglick Jesse Glick
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

              Created:
              Updated:
              Resolved: