mirror of
https://github.com/weaveworks/scope.git
synced 2026-03-03 18:20:27 +00:00
Squashed 'tools/' changes from 8c6170d..0620e58
0620e58Review tweaks git-subtree-dir: tools git-subtree-split:0620e589fa
This commit is contained in:
@@ -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 ]
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user