[FIXED JENKINS-35316] Nuget plugin publication succeeds when nupkg do…

…esn't exist
jenkinsci · Aug 5, 2016 · a5d359d · a5d359d
1 parent c07c204
commit a5d359d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/nuget/publishers/NugetPromotionPublisher.java b/src/main/java/org/jenkinsci/plugins/nuget/publishers/NugetPromotionPublisher.java
@@ -51,8 +51,8 @@ public class NugetPromotionPublisher extends NugetPublisher {
     private static final String PROMOTION_CLASS_NAME = "hudson.plugins.promoted_builds.Promotion";
 
     @DataBoundConstructor
-    public NugetPromotionPublisher(String name, String packagesPattern, String publishPath, String nugetPublicationName, String packagesExclusionPattern, boolean useWorkspaceInPromotion) {
-        super(name, packagesPattern, publishPath, nugetPublicationName, packagesExclusionPattern);
+    public NugetPromotionPublisher(String name, String packagesPattern, String publishPath, String nugetPublicationName, String packagesExclusionPattern, boolean useWorkspaceInPromotion, boolean doNotFailIfNoPackagesArePublished) {
+        super(name, packagesPattern, publishPath, nugetPublicationName, packagesExclusionPattern, doNotFailIfNoPackagesArePublished);
         this.useWorkspaceInPromotion = useWorkspaceInPromotion;
     }
 

diff --git a/src/main/java/org/jenkinsci/plugins/nuget/publishers/NugetPublisher.java b/src/main/java/org/jenkinsci/plugins/nuget/publishers/NugetPublisher.java
@@ -35,14 +35,16 @@ public class NugetPublisher extends Recorder {
     protected String publishPath;
     protected String nugetPublicationName;
     protected String packagesExclusionPattern;
+    protected boolean doNotFailIfNoPackagesArePublished;
 
     @DataBoundConstructor
-    public NugetPublisher(String name, String packagesPattern, String publishPath, String nugetPublicationName, String packagesExclusionPattern) {
+    public NugetPublisher(String name, String packagesPattern, String publishPath, String nugetPublicationName, String packagesExclusionPattern, boolean doNotFailIfNoPackagesArePublished) {
         this.name = name;
         this.packagesPattern = packagesPattern;
         this.publishPath = StringUtils.trim(publishPath);
         this.nugetPublicationName = nugetPublicationName;
         this.packagesExclusionPattern = packagesExclusionPattern;
+        this.doNotFailIfNoPackagesArePublished = doNotFailIfNoPackagesArePublished;
     }
 
     @Override
@@ -80,6 +82,9 @@ protected FilePath getFilesRoot(AbstractBuild<?, ?> build) {
     }
 
     private void checkErrors(List<PublicationResult> results) throws AbortException {
+        if (results.isEmpty() && !doNotFailIfNoPackagesArePublished) {
+            throw new AbortException("No packages were published.");
+        }
         for(PublicationResult result : results) {
             if (!result.isSuccess()) {
                 throw new AbortException("There were errors while publishing packages to NuGet.");
@@ -112,6 +117,10 @@ public String getNugetPublicationName() {
         return nugetPublicationName;
     }
 
+    public boolean isDoNotFailIfNoPackagesArePublished() {
+        return doNotFailIfNoPackagesArePublished;
+    }
+
     @Extension
     public static final class NugetPublisherDescriptor extends BuildStepDescriptor<Publisher> {
 

diff --git a/src/main/java/org/jenkinsci/plugins/nuget/publishers/NugetPublisherCallable.java b/src/main/java/org/jenkinsci/plugins/nuget/publishers/NugetPublisherCallable.java
@@ -15,7 +15,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**

diff --git a/src/main/resources/org/jenkinsci/plugins/nuget/publishers/NugetPublisher/config.jelly b/src/main/resources/org/jenkinsci/plugins/nuget/publishers/NugetPublisher/config.jelly
@@ -40,4 +40,7 @@
     <f:entry title="${%publishPath}" description="${%publishPathDescription}" field="publishPath">
         <f:textbox value="${instance.publishPath}"/>
     </f:entry>
+    <f:entry title="${%DoNotFailIfNoPackagesArePublished}" field="doNotFailIfNoPackagesArePublished">
+        <f:checkbox value="${instance.doNotFailIfNoPackagesArePublished}"/>
+    </f:entry>
 </j:jelly>