[JENKINS-27299] Define disabled in ParameterizedJob rather than AbstractProject #2866

jglick · 2017-05-03T00:15:07Z

JENKINS-27299

Subsumes #2864. Supersedes #2544.

@reviewbybees

…g deprecated Remoting-based CLI calls with CLICommandInvoker.

…key on just one!

…hile we are here.

…y for unknown reasons.

…sabled-JENKINS-27299

…sabled.jelly.

jglick · 2017-05-04T22:54:56Z

test/src/test/java/hudson/cli/EnableJobCommandTest.java

-    void test() {
-        def p = j.createFreeStyleProject()
-
-        def cli = new CLI(j.getURL())


One of a few forgotten in #2795 because they were in Groovy code and so did not appear in my usage search.

ghost · 2017-05-05T19:32:59Z

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

…riggerItem.

daniel-beck · 2017-05-05T21:50:44Z

Unfortunately AbstractProject.schedulePolling cannot delegate to SCMTriggerItem.

Why?

jglick · 2017-05-05T22:37:33Z

Why?

Because it cannot call this.schedulePolling(), lest we go into an infinite loop (as FindBugs was so kind as to point out); and SCMTriggerItem.super.schedulePolling() will not compile since AbstractProject itself is not an SCMTriggerItem (Project is).

abayer · 2017-05-09T16:01:39Z

I really can't review this effectively until #2864 gets merged.

…sabled-JENKINS-27299

jglick · 2017-05-09T22:40:45Z

I really can't review this effectively until #2864 gets merged.

Would an effective diff link help? You cannot comment on it but you can see the new changes, and refer back to files of this PR to add comments.

oleg-nenashev

🐝 from what I see

oleg-nenashev · 2017-05-11T12:07:54Z

core/src/main/java/hudson/cli/BuildCommand.java

@@ -158,7 +158,7 @@ protected int run() throws Exception {

        if (!job.isBuildable()) {
            String msg = Messages.BuildCommand_CLICause_CannotBuildUnknownReasons(job.getFullDisplayName());
-            if (job instanceof AbstractProject<?, ?> && ((AbstractProject<?, ?>)job).isDisabled()) {
+            if (job instanceof ParameterizedJobMixIn.ParameterizedJob && ((ParameterizedJobMixIn.ParameterizedJob) job).isDisabled()) {


Not 100% clear. Would be preferable to also have it on the Job level directly or in BuildableItem. But better than it was before

It is indeed a little tricky. Job does define buildable (without any explanation), but the idea here was to define disabled in ParameterizedJob since that is now the home for “Job which we could potentially request a build of, perhaps with parameters, so long as that is not disabled” (i.e., basically everything except ExternalJob).

BuildableItem (not to be confused with Queue.BuildableItem!), well, this interface is a historical relic: very little code actually deals with objects declared to be of this type and expects scheduleBuild overloads to work. I am implementing it for completeness; AbstractProject and WorkflowJob, the only ParameterizedJobs out there, already implemented it anyway, so this is just to make it easier to provide default implementations for those four methods (mostly superseded by scheduleBuild2 overloads).

oleg-nenashev · 2017-05-11T12:08:22Z

core/src/main/java/hudson/cli/declarative/CLIRegisterer.java

@@ -279,7 +280,7 @@ protected int run() throws Exception {
                            throw new UnsupportedOperationException();
                        }
                    }));
-                } catch (ClassNotFoundException e) {
+                } catch (ClassNotFoundException | MissingResourceException e) {


huh? is it related?

Yes, see commit introducing it. The enable-job and disable-job @CLIMethods were moved, and if you forget to move the corresponding shortDescription, as I initially did, you not only break those CLI commands, you break every other CLI command too.

jglick · 2017-05-11T16:21:29Z

@reviewbybees done

@jenkinsci/code-reviewers may be interested in this & related PRs

oleg-nenashev · 2017-05-13T10:26:25Z

Occasionally merged upstream PR with squash. Will cleanup and merge other stuff towards 2.61 as we discussed at the governance meeting

jglick added 5 commits May 1, 2017 15:33

Offering default methods on ParameterizedJob.

2e27be7

Javadoc typo.

fbadce3

Cleaner use of default methods in ParameterizedJob.

626b876

Need to pick up jenkinsci/bridge-method-injector#15 to be able to build.

3139f23

Sketch of pulling disabled functionality into ParameterizedJob.

d71db0f

jglick added the work-in-progress The PR is under active development, not ready to the final review label May 3, 2017

jglick mentioned this pull request May 3, 2017

[JENKINS-27299] WorkflowJob.disabled jenkinsci/workflow-job-plugin#46

Merged

jglick added 10 commits May 4, 2017 10:10

EnableJobCommandTest.groovy → EnableJobCommandTest.java, and replacin…

9318eef

…g deprecated Remoting-based CLI calls with CLICommandInvoker.

All CLI commands could be broken by a missing CLI.*.shortDescription …

b7e1d86

…key on just one!

Forgot to move CLI method short descriptions to new package.

41630e2

Needed a @CLIResolver for ParameterizedJob. Adding an OptionHandler w…

1fffbed

…hile we are here.

Trying to fix up access-modifier versions; started failing in CI toda…

cd95d2b

…y for unknown reasons.

Introduced <p:makeDisabled/> by analogy with <p:config-disableBuild/>.

137b8ec

Using new type bounds.

36a5301

Merge branch 'ParameterizedJobMixIn-defaults' into AbstractProject.di…

1c759d3

…sabled-JENKINS-27299

access-modifier 1.11 released.

59fb6e6

MatrixProject and MavenModuleSet both expect to have access to makeDi…

aeb9952

…sabled.jelly.

jglick commented May 4, 2017

View reviewed changes

jglick added 4 commits May 4, 2017 19:18

Trying to generalize some more.

bb617a6

Minor simplification.

1517179

[JENKINS-34716] Generalizing doPolling and schedulePolling.

265ae0a

isBuildable

b6459e1

jglick added a commit to jglick/workflow-job-plugin that referenced this pull request May 5, 2017

Depend on jenkinsci/jenkins#2866, merging jenkinsci#45 & jenkinsci#46.

4f82c21

jglick mentioned this pull request May 5, 2017

[JENKINS-27299] WorkflowJob.disabled on new core jenkinsci/workflow-job-plugin#47

Merged

jglick added 2 commits May 5, 2017 15:06

Obsolete comment.

30c6674

Updated comments.

244e419

jglick added needs-more-reviews Complex change, which would benefit from more eyes and removed work-in-progress The PR is under active development, not ready to the final review labels May 5, 2017

jglick requested a review from abayer May 5, 2017 19:28

jglick added 2 commits May 5, 2017 15:55

bridge-method-injector 1.17

82ad44a

Unfortunately AbstractProject.schedulePolling cannot delegate to SCMT…

d24bb16

…riggerItem.

jglick mentioned this pull request May 5, 2017

[JENKINS-28113] Allow freestyle builds to trigger downstream Pipeline builds #2873

Merged

jglick mentioned this pull request May 5, 2017

Make all CLI commands compatible with Pipeline where possible #2874

Merged

6 tasks

jglick added 3 commits May 9, 2017 13:58

bridge-method-injector 1.17

faaee4c

Merge branch 'master' into ParameterizedJobMixIn-defaults

8f49071

Merge branch 'ParameterizedJobMixIn-defaults' into AbstractProject.di…

0a00506

…sabled-JENKINS-27299

Merge branch 'master' into AbstractProject.disabled-JENKINS-27299

f0b79a0

oleg-nenashev approved these changes May 11, 2017

View reviewed changes

jglick added ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback and removed needs-more-reviews Complex change, which would benefit from more eyes labels May 11, 2017

Merge branch 'master' into AbstractProject.disabled-JENKINS-27299

500037a

oleg-nenashev merged commit 3af0cc6 into jenkinsci:master May 14, 2017

jglick deleted the AbstractProject.disabled-JENKINS-27299 branch May 15, 2017 13:56

jglick mentioned this pull request Jun 13, 2017

[JENKINS-41631] Running requireUpperBoundDeps jenkinsci/plugin-pom#67

Merged

stephenc mentioned this pull request Jul 14, 2017

[FIXED JENKINS-45322] Computed folder should disable orphaned items jenkinsci/cloudbees-folder-plugin#101

Merged

jglick mentioned this pull request Jun 12, 2023

Ignore notifyCommit requests to disabled Pipeline jobs jenkinsci/git-plugin#1465

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[JENKINS-27299] Define disabled in ParameterizedJob rather than AbstractProject #2866

[JENKINS-27299] Define disabled in ParameterizedJob rather than AbstractProject #2866

jglick commented May 3, 2017 •

edited

jglick May 4, 2017

ghost commented May 5, 2017

daniel-beck commented May 5, 2017

jglick commented May 5, 2017

abayer commented May 9, 2017

jglick commented May 9, 2017

oleg-nenashev left a comment

oleg-nenashev May 11, 2017

jglick May 11, 2017

oleg-nenashev May 11, 2017

jglick May 11, 2017

oleg-nenashev May 11, 2017

jglick commented May 11, 2017 •

edited

oleg-nenashev commented May 13, 2017

[JENKINS-27299] Define disabled in ParameterizedJob rather than AbstractProject #2866

[JENKINS-27299] Define disabled in ParameterizedJob rather than AbstractProject #2866

Conversation

jglick commented May 3, 2017 • edited

jglick May 4, 2017

Choose a reason for hiding this comment

ghost commented May 5, 2017

daniel-beck commented May 5, 2017

jglick commented May 5, 2017

abayer commented May 9, 2017

jglick commented May 9, 2017

oleg-nenashev left a comment

Choose a reason for hiding this comment

oleg-nenashev May 11, 2017

Choose a reason for hiding this comment

jglick May 11, 2017

Choose a reason for hiding this comment

oleg-nenashev May 11, 2017

Choose a reason for hiding this comment

jglick May 11, 2017

Choose a reason for hiding this comment

oleg-nenashev May 11, 2017

Choose a reason for hiding this comment

jglick commented May 11, 2017 • edited

oleg-nenashev commented May 13, 2017

jglick commented May 3, 2017 •

edited

jglick commented May 11, 2017 •

edited