diff --git a/runner/runner.go b/runner/runner.go index f09ffcd6d..bfac9c58b 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -138,16 +138,11 @@ func updateScheduler(test string, duration float64) { func getSchedule(tests []string) ([]string, error) { var ( - prefix = os.Getenv("SCHEDULER_PREFIX") - buildNum = os.Getenv("CIRCLE_BUILD_NUM") + testRun = "integration-" + os.Getenv("CIRCLE_BUILD_NUM") shardCount = os.Getenv("CIRCLE_NODE_TOTAL") shardID = os.Getenv("CIRCLE_NODE_INDEX") requestBody = &bytes.Buffer{} - testRun = "integration-" + buildNum ) - if prefix != "" { - testRun = prefix + "-" + buildNum - } if err := json.NewEncoder(requestBody).Encode(schedule{tests}); err != nil { return []string{}, err } diff --git a/test b/test index 7037ee789..9250f6280 100755 --- a/test +++ b/test @@ -63,7 +63,7 @@ for dir in $TESTDIRS; do GO_TEST_ARGS_RUN="$GO_TEST_ARGS" if [ -n "$SLOW" ]; then - COVERPKGS=$( (go list $dir; go list -f '{{join .Deps "\n"}}' $dir | grep -v "vendor" | grep "^$PACKAGE_BASE/") | paste -s -d,) + COVERPKGS=$( (go list $dir; go list -f '{{join .Deps "\n"}}' $dir | grep -v "vendor" | grep "^$PACKAGE_BASE/") | paste -s -d, -) output=$(mktemp $coverdir/unit.XXXXXXXXXX) GO_TEST_ARGS_RUN="$GO_TEST_ARGS -coverprofile=$output -coverpkg=$COVERPKGS" fi