Skip to content

Commit 05c4ede

Browse files
author
Nikolay Musienko
committed
Add exit code for agent checking script
1 parent 731cff6 commit 05c4ede

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

src/main/java/com/griddynamics/jagger/jenkins/plugin/JaggerEasyDeployPlugin.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public class JaggerEasyDeployPlugin extends Builder
5353

5454
private transient Engine transformEngine;
5555

56+
private final Map<String, Integer> errorCodes = new HashMap<String, Integer>();
57+
5658
/**
5759
* Constructor where fields from *.jelly will be passed
5860
* @param sutsList
@@ -205,9 +207,16 @@ private String generateScript() throws IOException {
205207
args.put("collecting-results", collectResults());
206208
args.put("stopping-agents", stopAgents());
207209

210+
loadErrorCodes();
211+
args.putAll(errorCodes);
212+
208213
return transformEngine.transform(ScriptTemplate.MAIN.getTemplateString(), args);
209214
}
210215

216+
private void loadErrorCodes() {
217+
errorCodes.put("error-code-agent-not-running", 256);
218+
}
219+
211220

212221
private String stopAgents() throws IOException {
213222

src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/agent.checking.script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ JOUT=$(ssh${ssh-key-path} ${user-name}@${server-address} "pgrep -f AgentStarter"
66
echo "No AgentStarter running on ${server-address}" 1>&2;
77

88
FAIL_IF_AGENT_NOT_RUNNING="${fail-if-not-running}"
9-
if [ $FAIL_IF_AGENT_NOT_RUNNING = "true" ] ; then
10-
exit $JOUT
9+
if [ $FAIL_IF_AGENT_NOT_RUNNING = "true" ] ; then}"
10+
exit $ERROR_CODE_AGENT_NOT_RUNNING
1111
fi
1212
fi

src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/main.script

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ rm -rf ${base-directory}
44
sleep 2
55
mkdir ${base-directory}
66

7+
#Error codes:
8+
ERROR_CODE_AGENT_NOT_RUNNING=${error-code-agent-not-running}
79

810
echo "Deploying"
911
${deploying}

0 commit comments

Comments
 (0)