JENKINS-49488: implement any_met_condition flag for PromotionProcess.…

…isMet()

When any_met_condition flag is true,
any met promotion condition would qualify for promote.

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

@@ -57,6 +57,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Future;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import javax.annotation.CheckForNull;
@@ -90,6 +91,11 @@ public final class PromotionProcess extends AbstractProject<PromotionProcess,Pro
      */
     public String isVisible;
 
+    /**
+     * Trigger promotion when any criteria condition is met.
+     */
+    public boolean any_met_condition;
+
     private List<BuildStep> buildSteps = new ArrayList<BuildStep>();
 
     /*package*/ PromotionProcess(JobPropertyImpl property, String name) {
@@ -144,6 +150,7 @@ public void doSetName(String name) {
             assignedLabel = null;
         }
         isVisible = c.getString("isVisible");
+        any_met_condition = c.optBoolean("any_met_condition");
         save();
     }
 
@@ -372,11 +379,21 @@ public Status isMet(AbstractBuild<?,?> build) {
         List<PromotionBadge> badges = new ArrayList<PromotionBadge>();
         for (PromotionCondition cond : conditions) {
             PromotionBadge b = cond.isMet(this, build);
-            if(b==null)
-                return null;
-            badges.add(b);
+            LOGGER.log(Level.INFO, "PromotionProcess.isMet(): any_met_condition={0}", this.any_met_condition);
+            if (this.any_met_condition) {
+                if (b!=null)
+                    badges.add(b);
+            } else {
+                if(b==null)
+                    return null;
+                badges.add(b);
+            }
+        }
+        if (badges.isEmpty()) {
+            return null;
+        } else {
+            return new Status(this,badges);
         }
-        return new Status(this,badges);
     }
 
     /**

src/main/resources/hudson/plugins/promoted_builds/PromotionProcess/process-config.jelly

@@ -41,6 +41,11 @@
         </select>
       </f:entry>
 
+      <f:entry title="Any_Met">
+      <f:checkbox name="any_met_condition" title="${%Trigger promotion when any criteria condition is met}"
+                    checked="${instance.any_met_condition}"/>
+      </f:entry>
+
       <f:optionalBlock name="hasAssignedLabel" title="${%Restrict where this promotion process can be run}"
                        checked="${instance.assignedLabelString!=null}" inline="true">
         <f:entry title="${%Label Expression}"