diff --git a/executor/executor.go b/executor/executor.go index 5b7cf1d..37ed71b 100644 --- a/executor/executor.go +++ b/executor/executor.go @@ -157,7 +157,7 @@ func doRunCommand(guid, path string, emitter screwdriver.Emitter, f *os.File, fR // Executes teardown commands func doRunTeardownCommand(cmd screwdriver.CommandDef, emitter screwdriver.Emitter, shellBin, exportFile, sourceDir string, stepExitCode int) (int, error) { shargs := []string{"-e", "-c"} - cmdStr := "export PATH=${PATH}:/opt/sd:/usr/sd/bin SD_STEP_EXIT_CODE=" + strconv.Itoa(stepExitCode) + " && " + + cmdStr := "export PATH=${PATH}:/opt/sd:/usr/sd/bin:/usr/sd-static/bin SD_STEP_EXIT_CODE=" + strconv.Itoa(stepExitCode) + " && " + "START=$(date +'%s'); while ! [ -f " + exportFile + " ] && [ $(($(date +'%s')-$START)) -lt " + strconv.Itoa(WaitTimeout) + " ]; do sleep 1; done; " + "if [ -f " + exportFile + " ]; then set +e; . " + exportFile + "; set -e; fi; " + cmd.Cmd @@ -281,7 +281,7 @@ func Run(path string, env []string, emitter screwdriver.Emitter, build screwdriv // Run setup commands setupCommands := []string{ "set -e", - "export PATH=${PATH}:/opt/sd:/usr/sd/bin", + "export PATH=${PATH}:/opt/sd:/usr/sd/bin:/usr/sd-static/bin", // trap ABRT(6) and EXIT, echo the last step ID and write ENV to /tmp/buildEnv "finish() { " + "EXITCODE=$?; " +