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

regression resolving Descriptor using "$class" vs "kind"

    XMLWordPrintable

Details

    Description

      https://github.com/jenkinsci/jenkins/commit/4de46465153dae1a9e804c0d526c44d528f00fb4 restored support for "kind" as a way to resolve descriptor matching a configured entity.

      Side effect is : a descriptor which uses a custom string as ID (as recommended by hudson.model.Descriptor#getId) won't be resolved as hudson.model.Descriptor#find who will compare ID with $class, not kind=ID.

      Attachments

        Issue Links

          Activity

            jglick Jesse Glick added a comment -

            JENKINS-28212 is apparently unrelated (a regression in a plugin, reproducible in 1.580.1), so this fix plus its follow-ups is back on the table from my perspective.

            jglick Jesse Glick added a comment - JENKINS-28212 is apparently unrelated (a regression in a plugin, reproducible in 1.580.1), so this fix plus its follow-ups is back on the table from my perspective.

            Code changed in jenkins
            User: Nicolas De Loof
            Path:
            core/src/main/java/hudson/model/Descriptor.java
            core/src/main/resources/lib/form/class-entry.jelly
            http://jenkins-ci.org/commit/jenkins/dfa17c4a18cb9585681102770db8b7117eab9531
            Log:
            JENKINS-26781 lookup descriptor by ID, then by class if explicitly set
            to match some specific use cases.

            (cherry picked from commit 8881703f7c7351695c5d5b2662faefae60de68e8)

            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Nicolas De Loof Path: core/src/main/java/hudson/model/Descriptor.java core/src/main/resources/lib/form/class-entry.jelly http://jenkins-ci.org/commit/jenkins/dfa17c4a18cb9585681102770db8b7117eab9531 Log: JENKINS-26781 lookup descriptor by ID, then by class if explicitly set to match some specific use cases. (cherry picked from commit 8881703f7c7351695c5d5b2662faefae60de68e8)

            Code changed in jenkins
            User: Jesse Glick
            Path:
            test/src/test/java/hudson/model/DescriptorTest.java
            http://jenkins-ci.org/commit/jenkins/00cbb2823187df7efcf8c9de33907f0f58c77729
            Log:
            JENKINS-26781 Reproduced problem in test.
            Besides failing in master, it also fails in 4e0af43 (merge of #1443), but passes in the 1.598-SNAPSHOT parent 239caf8.
            (cherry picked from commit 33041903ab67c3e32959b7b78e557ffb7d4ecd16)

            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Jesse Glick Path: test/src/test/java/hudson/model/DescriptorTest.java http://jenkins-ci.org/commit/jenkins/00cbb2823187df7efcf8c9de33907f0f58c77729 Log: JENKINS-26781 Reproduced problem in test. Besides failing in master, it also fails in 4e0af43 (merge of #1443), but passes in the 1.598-SNAPSHOT parent 239caf8. (cherry picked from commit 33041903ab67c3e32959b7b78e557ffb7d4ecd16)

            Code changed in jenkins
            User: Oliver Gondža
            Path:
            core/src/main/java/hudson/DescriptorExtensionList.java
            core/src/main/java/hudson/model/ComputerSet.java
            core/src/main/java/hudson/model/Descriptor.java
            core/src/main/java/hudson/model/Items.java
            core/src/main/java/hudson/tools/ToolLocationNodeProperty.java
            core/src/main/java/hudson/util/DescriptorList.java
            core/src/main/resources/lib/form/class-entry.jelly
            test/src/test/java/hudson/model/DescriptorTest.java
            test/src/test/resources/hudson/model/DescriptorTest/B1/config.jelly
            test/src/test/resources/hudson/model/DescriptorTest/B2/config.jelly
            test/src/test/resources/hudson/model/DescriptorTest/D1/config.jelly
            test/src/test/resources/hudson/model/DescriptorTest/D2/config.jelly
            test/src/test/resources/hudson/model/DescriptorTest/D3/config.jelly
            http://jenkins-ci.org/commit/jenkins/0f0047a17d04aa0111e76046b5d3c8b1208e8385
            Log:
            Merge pull request #1701 from jglick/backport-JENKINS-26781

            JENKINS-26781 Backport to 1.609

            Compare: https://github.com/jenkinsci/jenkins/compare/aadc9914ff34...0f0047a17d04

            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Oliver Gondža Path: core/src/main/java/hudson/DescriptorExtensionList.java core/src/main/java/hudson/model/ComputerSet.java core/src/main/java/hudson/model/Descriptor.java core/src/main/java/hudson/model/Items.java core/src/main/java/hudson/tools/ToolLocationNodeProperty.java core/src/main/java/hudson/util/DescriptorList.java core/src/main/resources/lib/form/class-entry.jelly test/src/test/java/hudson/model/DescriptorTest.java test/src/test/resources/hudson/model/DescriptorTest/B1/config.jelly test/src/test/resources/hudson/model/DescriptorTest/B2/config.jelly test/src/test/resources/hudson/model/DescriptorTest/D1/config.jelly test/src/test/resources/hudson/model/DescriptorTest/D2/config.jelly test/src/test/resources/hudson/model/DescriptorTest/D3/config.jelly http://jenkins-ci.org/commit/jenkins/0f0047a17d04aa0111e76046b5d3c8b1208e8385 Log: Merge pull request #1701 from jglick/backport- JENKINS-26781 JENKINS-26781 Backport to 1.609 Compare: https://github.com/jenkinsci/jenkins/compare/aadc9914ff34...0f0047a17d04
            dogfood dogfood added a comment -

            Integrated in jenkins_main_trunk #4292
            JENKINS-26781 lookup descriptor by ID, then by class if explicitly set (Revision dfa17c4a18cb9585681102770db8b7117eab9531)
            JENKINS-26781 Reproduced problem in test. (Revision 00cbb2823187df7efcf8c9de33907f0f58c77729)

            Result = UNSTABLE
            jesse glick : dfa17c4a18cb9585681102770db8b7117eab9531
            Files :

            • core/src/main/java/hudson/model/Descriptor.java
            • core/src/main/resources/lib/form/class-entry.jelly

            jesse glick : 00cbb2823187df7efcf8c9de33907f0f58c77729
            Files :

            • test/src/test/java/hudson/model/DescriptorTest.java
            dogfood dogfood added a comment - Integrated in jenkins_main_trunk #4292 JENKINS-26781 lookup descriptor by ID, then by class if explicitly set (Revision dfa17c4a18cb9585681102770db8b7117eab9531) JENKINS-26781 Reproduced problem in test. (Revision 00cbb2823187df7efcf8c9de33907f0f58c77729) Result = UNSTABLE jesse glick : dfa17c4a18cb9585681102770db8b7117eab9531 Files : core/src/main/java/hudson/model/Descriptor.java core/src/main/resources/lib/form/class-entry.jelly jesse glick : 00cbb2823187df7efcf8c9de33907f0f58c77729 Files : test/src/test/java/hudson/model/DescriptorTest.java

            People

              jglick Jesse Glick
              ndeloof Nicolas De Loof
              Votes:
              0 Vote for this issue
              Watchers:
              4 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: