[JENKINS-40780] Fix blocker bug when launched in a pipeline

jenkinsci · Jan 3, 2017 · bd1b928 · bd1b928
1 parent 936d990
commit bd1b928
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/ansible/AnsibleAdHocCommandBuilder.java b/src/main/java/org/jenkinsci/plugins/ansible/AnsibleAdHocCommandBuilder.java
@@ -163,7 +163,7 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath ws, @Nonnull Launc
             CLIRunner runner = new CLIRunner(run, ws, launcher, listener);
             Computer computer = Computer.currentComputer();
             if (computer == null) {
-                throw new AbortException("The ansible playbook build step requires to be launched on a node");
+                throw new AbortException("The ansible ad-hoc command build step requires to be launched on a node");
             }
             EnvVars envVars = run.getEnvironment(listener);
             String exe = AnsibleInstallation.getExecutable(ansibleName, AnsibleCommand.ANSIBLE, computer.getNode(), listener, envVars);

diff --git a/src/main/java/org/jenkinsci/plugins/ansible/workflow/AnsiblePlaybookStep.java b/src/main/java/org/jenkinsci/plugins/ansible/workflow/AnsiblePlaybookStep.java
@@ -323,7 +323,6 @@ protected Void run() throws Exception {
             builder.setHostKeyChecking(false);
             builder.setUnbufferedOutput(true);
             builder.setColorizedOutput(step.isColorized());
-            Computer computer = Computer.currentComputer();
             Node node;
             if (computer == null || (node = computer.getNode()) == null) {
                 throw new AbortException("The ansible playbook build step requires to be launched on a node");