First step in fixing JENKINS-19658

jenkinsci · Mar 5, 2014 · 2a610b3 · 2a610b3
1 parent e586cba
commit 2a610b3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/net/praqma/hudson/notifier/CCUCMNotifier.java b/src/main/java/net/praqma/hudson/notifier/CCUCMNotifier.java
@@ -78,9 +78,6 @@ public boolean perform( AbstractBuild<?, ?> build, Launcher launcher, BuildListe
 
 		boolean result = true;
 		out = listener.getLogger();
-
-        logger.fine( "BEGINNING NOTIFIER: " + build.getProject().getPublishersList() );
-
 		status = new Status();
 
 		/* Prepare job variables */

diff --git a/src/main/java/net/praqma/hudson/scm/CCUCMScm.java b/src/main/java/net/praqma/hudson/scm/CCUCMScm.java
@@ -367,7 +367,6 @@ public void setAddPostBuild(boolean addPostBuild) {
 
     private boolean checkInput(TaskListener listener) {
         PrintStream out = listener.getLogger();
-
         out.println("[" + Config.nameShort + "] Verifying input");
 
         /* Check baseline template */
@@ -392,6 +391,7 @@ private boolean checkInput(TaskListener listener) {
                 }
             } else {
                 out.println("[" + Config.nameShort + "] You cannot create a baseline in this mode");
+                return false;
             }
         }
 
@@ -661,7 +661,7 @@ public PollingResult compareRemoteRevisionWith(AbstractProject<?, ?> project, La
 
         logger.fine("Let's go!");
 
-        /* Check input */
+        /* Check input */        
         if (checkInput(listener)) {
 
             printParameters(out);

diff --git a/src/test/java/net/praqma/hudson/test/CCUCMRule.java b/src/test/java/net/praqma/hudson/test/CCUCMRule.java
@@ -5,6 +5,7 @@
 import hudson.model.Project;
 import hudson.scm.ChangeLogSet;
 import hudson.scm.ChangeLogSet.Entry;
+import hudson.slaves.DumbSlave;
 
 import java.io.File;
 import java.io.IOException;
@@ -336,15 +337,16 @@ public boolean perform( AbstractBuild<?, ?> build, Launcher launcher, BuildListe
         }
     }
 
-    public AbstractBuild<?, ?> buildProject( AbstractProject<?, ?> project, boolean fail ) throws IOException {
-        return buildProject( project, fail, null );
+    public AbstractBuild<?, ?> buildProject( AbstractProject<?, ?> project, boolean fail ) throws IOException, Exception {
+        return buildProject( project, fail, createSlave() );
     }
 
 	public AbstractBuild<?, ?> buildProject( AbstractProject<?, ?> project, boolean fail, Slave slave ) throws IOException {
 
         if( slave != null ) {
-            logger.fine( "Running on " + slave );
-            project.setAssignedNode( slave );
+            System.out.println( String.format( "[SLAVE-CONFIG] Running on %s", slave.getSelfLabel().getName() ) );
+            logger.fine( String.format( "Running on %s", slave.getSelfLabel().getName() ) );
+            project.setAssignedLabel(slave.getSelfLabel());
         }
 
         EnableLoggerAction action = null;
@@ -355,7 +357,7 @@ public boolean perform( AbstractBuild<?, ?> build, Launcher launcher, BuildListe
 
 		AbstractBuild<?, ?> build = null;
 		try {
-			build = project.scheduleBuild2( 0, new Cause.UserCause(), action ).get();
+			build = project.scheduleBuild2(0, new Cause.UserCause(), action ).get();
 		} catch( Exception e ) {
 			logger.info( "Build failed(" + (fail?"on purpose":"it should not?") + "): " + e.getMessage() );
 		}

diff --git a/src/test/java/net/praqma/hudson/test/integration/userstories/Story06Base.java b/src/test/java/net/praqma/hudson/test/integration/userstories/Story06Base.java
@@ -4,6 +4,7 @@
 import hudson.model.Project;
 import hudson.model.Result;
 import hudson.model.Slave;
+import hudson.slaves.DumbSlave;
 import net.praqma.clearcase.Deliver;
 import net.praqma.clearcase.exceptions.ClearCaseException;
 import net.praqma.clearcase.test.junit.ClearCaseRule;