Skip to content

Commit

Permalink
Squashed 'tools/' changes from 8c6170d..0620e58
Browse files Browse the repository at this point in the history
0620e58 Review tweaks

git-subtree-dir: tools
git-subtree-split: 0620e58
  • Loading branch information
jml committed Jul 12, 2016
1 parent 7a35f21 commit ca9e038
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion rebuild-image
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ has_changes() {
local rev1=$1
local rev2=$2
local changes
changes=$(git diff --oneline "$rev1..$rev2" -- "${INPUTFILES[@]}" | wc -l)
changes=$(git diff --oneline "$rev1..$rev2" -- "${INPUTFILES[@]}" | wc -l)
[ "$changes" -gt 0 ]
}

Expand Down
3 changes: 0 additions & 3 deletions runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,18 +155,15 @@ func getSchedule(tests []string) ([]string, error) {
shardID = os.Getenv("CIRCLE_NODE_INDEX")
requestBody = &bytes.Buffer{}
)
fmt.Printf("getSchedule: %v", tests)
if err := json.NewEncoder(requestBody).Encode(schedule{tests}); err != nil {
return []string{}, err
}
url := fmt.Sprintf("http://%s/schedule/%s/%s/%s", schedulerHost, testRun, shardCount, shardID)
fmt.Printf("POSTing to %v: %v", url, requestBody)
resp, err := http.Post(url, jsonContentType, requestBody)
if err != nil {
return []string{}, err
}
var sched schedule
fmt.Printf("Got response: %v", resp.Body)
if err := json.NewDecoder(resp.Body).Decode(&sched); err != nil {
return []string{}, err
}
Expand Down
2 changes: 1 addition & 1 deletion socks/connect.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ PROXY_CONTAINER=$(ssh "$HOST" weave run -d weaveworks/socksproxy)

function finish {
echo "Removing proxy container.."
# shellcheck disable=SC2029
# shellcheck disable=SC2029
ssh "$HOST" docker rm -f "$PROXY_CONTAINER"
}
trap finish EXIT
Expand Down

0 comments on commit ca9e038

Please sign in to comment.