[JENKINS-57903]- Refactor PromotionConditionDescriptor extension Point to make it Pipeline Compatible. #137

dernDren161 · 2019-06-20T09:35:19Z

NOTE: This PR is being built on top of this: #128 PR:
This PR is just an uplift for the original one. Besides #128 these are the additional features:

PromotionConditionDescriptor made Pipeline Compatible.
Other extension points (most of the PromotionConditions) also refactored since they were affected by the methods inside PromotionConditionDescriptor class.

Things included in #128 :

Made PromotionBadge compatible with pipelines.
Refactored other important extension points and modules.
Created a new interface named "PromotionRun".

See JENKINS-57903.

Your checklist for this pull request

Pull request title represents the changelog entry which will be used in Release Notes. JIRA issue is a part of the title (see existing PRs as examples)
Please describe what you did. Short summary for reviewers. If the change involves WebUI, add screenshots
Link to relevant Jenkins JIRA issues or pull requests
Test automation, if relevant. We expect autotests for all new features or complex bugfixes
Documentation if relevant (new features). We want to use Documentation-as-Code, just put docs to README or to new Doc files
Javadoc for new APIs. Any public/protected method is considered as API unless annotated by Restricted (docs)
ScreenShot of change:

CC

@oleg-nenashev @MadsNielsen @bicschneider @jonbrohauge

…I usages

…ds-plugin into facelift

…ns Pipeline

…r dependent files

oleg-nenashev

This PR is definitely on the right path. But we need test automation and some Javadoc patches before it can be merged

oleg-nenashev · 2019-06-20T10:18:17Z

src/main/java/hudson/plugins/promoted_builds/conditions/GroovyConditionDescriptor.java

 import java.util.logging.Level;
 import java.util.logging.Logger;

 /**
 * Declared outside GroovyCondition as it depends on the optional 'script-security' dependency
 */
 @Extension(optional = true)
-public final class GroovyConditionDescriptor extends PromotionConditionDescriptor {


No specific reason known for this just maybe because of the Job integrity it required multiple descriptors in pipelines(maybe) , just that the code compiled correctly this way would it break sth if final is removed?

oleg-nenashev · 2019-06-20T10:19:16Z

src/main/java/hudson/plugins/promoted_builds/conditions/SelfPromotionCondition.java

+                return isApplicable((AbstractProject)item, TaskListener.NULL);
+            }
+            return true;
+        }
        public boolean isApplicable(AbstractProject<?,?> item) {


The old APIs should be deprecated

oleg-nenashev · 2019-06-20T10:19:54Z

src/main/java/hudson/plugins/promoted_builds/conditions/UpstreamPromotionCondition.java

+            }
+            return true;
+        }
+
        public boolean isApplicable(AbstractProject<?,?> item) {


remove? Default implementation should be doing that

@oleg-nenashev okay so changes in the return is expected having only one?

oleg-nenashev · 2019-06-20T10:20:35Z

src/main/java/hudson/plugins/promoted_builds/pipeline/PromotionRun.java

@@ -1,10 +1,11 @@
-package hudson.plugins.promoted_builds;
+package hudson.plugins.promoted_builds.pipeline;


Javadoc needs to be added according to the acceptance criteria

oleg-nenashev · 2019-06-20T10:22:02Z

src/main/java/hudson/plugins/promoted_builds/conditions/ManualCondition.java

-import hudson.model.Run;
-import hudson.model.TaskListener;
-import hudson.model.User;
+import hudson.model.*;


Please do not squash imports in the production code.
Your IDE can be reconfigured to disable it

src/main/java/hudson/plugins/promoted_builds/PromotionConditionDescriptor.java

MadsNielsen · 2019-06-20T10:44:44Z

src/main/java/hudson/plugins/promoted_builds/conditions/GroovyConditionDescriptor.java

+   public boolean isApplicable(@Nonnull Job<?,?> item, TaskListener listener){
+        if(item instanceof AbstractProject){
+            return isApplicable((AbstractProject)item, TaskListener.NULL);
+        }else{


minor nitpick: formatting. Leave blank spaces for if and else statements like everywhere else.

Your IDE could be configured to do it for you

YAGNI

Cleanup README, detach CONTRIBUTING.md and add shields

Update Jenkins Core requirement to 2.138.4, use the modern Parent POM

oleg-nenashev

The current code breaks APIs for AbstractProjects

oleg-nenashev · 2019-06-22T22:56:46Z

src/main/java/hudson/plugins/promoted_builds/conditions/GroovyConditionDescriptor.java

+   }
+
+   public boolean isApplicable(AbstractProject<?, ?> item) {
+        return false;


Why? it will make it unusable

oleg-nenashev · 2019-06-22T23:15:03Z

CONTRIBUTING.md

@@ -0,0 +1,7 @@
+Contributing


The history got messed up after merge by me. Should not impact the delivery

oleg-nenashev · 2019-06-22T23:16:05Z

src/main/java/hudson/plugins/promoted_builds/AddPromotionBadge.java

+import java.io.IOException;
+import java.io.PrintStream;
+
+public class AddPromotionBadge extends Recorder implements SimpleBuildStep {


This code is still in the production scope, needs to be moved

oleg-nenashev and others added 7 commits May 31, 2019 11:04

Update Jenkins Core requirement to 2.60.3, use the modern Parent POM

72aca25

Fix Jenkinsfile

daa7a82

Update Jenkins Core to 2.138.x and cleanup Jenkins instance access AP…

0a9e676

…I usages

Merge branch 'facelift' of https://github.com/jenkinsci/promoted-buil…

084e389

…ds-plugin into facelift

More FindBugs cleanup

5666eef

[JENKINS-57839] - Initial PromotionBadge compatibility code for Jenki…

c3965f0

…ns Pipeline

[JENKINS-57903]- Refactor PromotionConditionDescriptor class and othe…

9c51d9e

…r dependent files

dernDren161 changed the title ~~Final~~ [JENKINS-57903]- Refactor PipelineConditionDescriptor extension Point to make it Pipeline Compatible. Jun 20, 2019

dernDren161 changed the title ~~[JENKINS-57903]- Refactor PipelineConditionDescriptor extension Point to make it Pipeline Compatible.~~ [JENKINS-57903]- Refactor PromotionConditionDescriptor extension Point to make it Pipeline Compatible. Jun 20, 2019

oleg-nenashev requested changes Jun 20, 2019

View reviewed changes

MadsNielsen reviewed Jun 20, 2019

View reviewed changes

oleg-nenashev and others added 16 commits June 21, 2019 01:13

Delete README.txt

69f69be

YAGNI

Add badges to README

7317087

Remove Contributing from README

162697b

Create CONTRIBUTING.md

68dd6c8

Merge pull request jenkinsci#138 from jenkinsci/doc-cleanup

fb198ac

Cleanup README, detach CONTRIBUTING.md and add shields

Maven Fix- For the PromotionConditionDescriptor

d1ce53d

Stub code for logic review

8aa5cec

Fix tests after ugrading the Jenkins and JTH baseline

bca15f9

FindBugs: Cleanup unrequired checks in Groovy conditions

e6b87eb

Merge pull request jenkinsci#124 from jenkinsci/facelift

bd7af12

Update Jenkins Core requirement to 2.138.4, use the modern Parent POM

[maven-release-plugin] prepare release promoted-builds-3.3

4ebbf5e

[maven-release-plugin] prepare for next development iteration

64a5bd4

Merge branches

307199d

Fix compilation errors in AddPromotionBadge

0eeda41

Restore code from d1ce53d by @dernDren161

2f6b639

Resolve Maven upper bounds issues

dd6de8a

oleg-nenashev requested changes Jun 22, 2019

View reviewed changes

oleg-nenashev and others added 2 commits June 23, 2019 01:17

Fix compilation issues in GroovyConditionDescriptor

8e4fca7

PR chnages w.r.t the reviews

4fa0b38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[JENKINS-57903]- Refactor PromotionConditionDescriptor extension Point to make it Pipeline Compatible. #137

[JENKINS-57903]- Refactor PromotionConditionDescriptor extension Point to make it Pipeline Compatible. #137

dernDren161 commented Jun 20, 2019 •

edited by jonbrohauge

Loading

oleg-nenashev left a comment

oleg-nenashev Jun 20, 2019

dernDren161 Jun 20, 2019

oleg-nenashev Jun 20, 2019

oleg-nenashev Jun 20, 2019

dernDren161 Jun 21, 2019 •

edited

Loading

oleg-nenashev Jun 20, 2019

oleg-nenashev Jun 20, 2019

MadsNielsen Jun 20, 2019

jonbrohauge Jun 20, 2019

oleg-nenashev left a comment

oleg-nenashev Jun 22, 2019

oleg-nenashev Jun 22, 2019

oleg-nenashev Jun 22, 2019

		@@ -1,10 +1,11 @@
		package hudson.plugins.promoted_builds;
		package hudson.plugins.promoted_builds.pipeline;

[JENKINS-57903]- Refactor PromotionConditionDescriptor extension Point to make it Pipeline Compatible. #137

Are you sure you want to change the base?

[JENKINS-57903]- Refactor PromotionConditionDescriptor extension Point to make it Pipeline Compatible. #137

Conversation

dernDren161 commented Jun 20, 2019 • edited by jonbrohauge Loading

Your checklist for this pull request

CC

oleg-nenashev left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dernDren161 Jun 21, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oleg-nenashev left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dernDren161 commented Jun 20, 2019 •

edited by jonbrohauge

Loading

dernDren161 Jun 21, 2019 •

edited

Loading