Skip to content
This repository was archived by the owner on Nov 7, 2023. It is now read-only.

fix the url cache & check build status after the delay #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix the url cache & check build status after the delay #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import org.jenkinsci.plugins.tokenmacro.TokenMacro;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.SystemUtils;
import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.StaplerRequest;
Expand All @@ -38,6 +39,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -612,14 +614,18 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
if (this.getBlockBuildUntilComplete()) {
listener.getLogger().println("Blocking local job until remote job completes");
// Form the URL for the triggered job
String jobLocation = jobURL + nextBuildNumber + "/api/json";
String jobLocation = MessageFormat.format("{0}{1,number,#}/api/json?seed={2,number,#}",
jobURL, nextBuildNumber, System.currentTimeMillis());


buildStatusStr = getBuildStatus(jobLocation, build, listener);

while (buildStatusStr.equals("not started")) {
listener.getLogger().println("Waiting for remote build to start.");
listener.getLogger().println("Waiting for " + this.pollInterval + " seconds until next poll.");
buildStatusStr = getBuildStatus(jobLocation, build, listener);

jobLocation = MessageFormat.format("{0}{1,number,#}/api/json?seed={2,number,#}",
jobURL, nextBuildNumber, System.currentTimeMillis());
// Sleep for 'pollInterval' seconds.
// Sleep takes miliseconds so need to convert this.pollInterval to milisecopnds (x 1000)
try {
Expand All @@ -628,6 +634,8 @@ public boolean perform(AbstractBuild build, Launcher launcher, BuildListener lis
} catch (InterruptedException e) {
this.failBuild(e, listener);
}

buildStatusStr = getBuildStatus(jobLocation, build, listener);
}

listener.getLogger().println("Remote build started!");
Expand Down