From ceb72ab5bf1f678bc099651309ced850fe902820 Mon Sep 17 00:00:00 2001 From: Tom Ross Date: Thu, 21 Apr 2022 13:02:23 +0100 Subject: [PATCH] CI: Reduce log spam in CI to fix errors with Buildkite reporting (#34262) --- dev/ci/yarn-build.sh | 2 +- dev/ci/yarn-run.sh | 4 ++-- dev/ci/yarn-test-separate.sh | 4 ++-- dev/ci/yarn-test.sh | 2 +- dev/ci/yarn-web-integration.sh | 2 +- enterprise/cmd/frontend/pre-build.sh | 2 +- enterprise/dev/ci/internal/ci/operations.go | 2 +- package.json | 10 +++++----- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dev/ci/yarn-build.sh b/dev/ci/yarn-build.sh index f8b2858f114..eea935d330c 100755 --- a/dev/ci/yarn-build.sh +++ b/dev/ci/yarn-build.sh @@ -8,7 +8,7 @@ echo "# Note: NODE_ENV only used for build command" echo "--- Yarn install in root" # mutex is necessary since CI runs various yarn installs in parallel -NODE_ENV='' yarn --mutex network --frozen-lockfile --network-timeout 60000 +NODE_ENV='' yarn --mutex network --frozen-lockfile --network-timeout 60000 --silent cd "$1" echo "--- browserslist" diff --git a/dev/ci/yarn-run.sh b/dev/ci/yarn-run.sh index c1643fbf398..a5c30fcd66d 100755 --- a/dev/ci/yarn-run.sh +++ b/dev/ci/yarn-run.sh @@ -4,8 +4,8 @@ set -e echo "--- yarn" # mutex is necessary since CI runs various yarn installs in parallel -yarn --mutex network --frozen-lockfile --network-timeout 60000 -yarn --mutex network --cwd dev/release --frozen-lockfile --network-timeout 60000 +yarn --mutex network --frozen-lockfile --network-timeout 60000 --silent +yarn --mutex network --cwd dev/release --frozen-lockfile --network-timeout 60000 --silent echo "--- generate" yarn gulp generate diff --git a/dev/ci/yarn-test-separate.sh b/dev/ci/yarn-test-separate.sh index 1037940a8ea..51fb13715b5 100755 --- a/dev/ci/yarn-test-separate.sh +++ b/dev/ci/yarn-test-separate.sh @@ -4,12 +4,12 @@ set -e echo "--- yarn in root" # mutex is necessary since CI runs various yarn installs in parallel -yarn --mutex network --frozen-lockfile --network-timeout 60000 +yarn --mutex network --frozen-lockfile --network-timeout 60000 --silent cd "$1" echo "--- yarn" # mutex is necessary since CI runs various yarn installs in parallel -yarn --mutex network --frozen-lockfile --network-timeout 60000 +yarn --mutex network --frozen-lockfile --network-timeout 60000 --silent echo "--- test" diff --git a/dev/ci/yarn-test.sh b/dev/ci/yarn-test.sh index 4877039a3eb..d2955163df5 100755 --- a/dev/ci/yarn-test.sh +++ b/dev/ci/yarn-test.sh @@ -4,7 +4,7 @@ set -e echo "--- yarn in root" # mutex is necessary since CI runs various yarn installs in parallel -yarn --mutex network --frozen-lockfile --network-timeout 60000 +yarn --mutex network --frozen-lockfile --network-timeout 60000 --silent echo "--- generate" yarn gulp generate diff --git a/dev/ci/yarn-web-integration.sh b/dev/ci/yarn-web-integration.sh index 5ac826f1842..e1123e1c5fb 100755 --- a/dev/ci/yarn-web-integration.sh +++ b/dev/ci/yarn-web-integration.sh @@ -8,7 +8,7 @@ tar -xf client.tar.gz -C . echo "--- Yarn install in root" # mutex is necessary since CI runs various yarn installs in parallel -yarn --mutex network --frozen-lockfile --network-timeout 60000 +yarn --mutex network --frozen-lockfile --network-timeout 60000 --silent echo "--- Run integration test suite" yarn percy exec yarn _cover-integration "$@" diff --git a/enterprise/cmd/frontend/pre-build.sh b/enterprise/cmd/frontend/pre-build.sh index 9ab04d1d0cb..0de5aada1b6 100755 --- a/enterprise/cmd/frontend/pre-build.sh +++ b/enterprise/cmd/frontend/pre-build.sh @@ -11,7 +11,7 @@ echo "--- yarn root" # mutex is necessary since frontend and the management-console can # run concurrent "yarn" installs # TODO: This is no longer needed since the management console was removed. -yarn --mutex network --frozen-lockfile --network-timeout 60000 +yarn --mutex network --frozen-lockfile --network-timeout 60000 --silent MAYBE_TIME_PREFIX="" if [[ "${CI_DEBUG_PROFILE:-"false"}" == "true" ]]; then diff --git a/enterprise/dev/ci/internal/ci/operations.go b/enterprise/dev/ci/internal/ci/operations.go index ac92f513e60..5982911d4a5 100644 --- a/enterprise/dev/ci/internal/ci/operations.go +++ b/enterprise/dev/ci/internal/ci/operations.go @@ -339,7 +339,7 @@ func clientChromaticTests(autoAcceptChanges bool) operations.Operation { stepOpts := []bk.StepOpt{ withYarnCache(), bk.AutomaticRetry(3), - bk.Cmd("yarn --mutex network --frozen-lockfile --network-timeout 60000"), + bk.Cmd("yarn --mutex network --frozen-lockfile --network-timeout 60000 --silent"), bk.Cmd("yarn gulp generate"), bk.Env("MINIFY", "1"), } diff --git a/package.json b/package.json index 384db68c8f5..c8fedc517a2 100644 --- a/package.json +++ b/package.json @@ -30,12 +30,12 @@ "_test-integration": "TS_NODE_PROJECT=client/web/src/integration/tsconfig.json mocha --parallel=$CI --retries=1 --jobs=2", "test-integration": "yarn _test-integration \"./client/web/src/integration/**/*.test.ts\"", "test-browser-integration": "yarn workspace @sourcegraph/browser run test-integration", - "_cover-integration": "nyc --hook-require=false yarn _test-integration", - "cover-integration": "nyc --hook-require=false yarn test-integration", - "cover-browser-integration": "nyc --hook-require=false yarn workspace @sourcegraph/browser test-integration", + "_cover-integration": "nyc --hook-require=false --silent yarn _test-integration", + "cover-integration": "nyc --hook-require=false --silent yarn test-integration", + "cover-browser-integration": "nyc --hook-require=false --silent yarn workspace @sourcegraph/browser test-integration", "test-lighthouse": "SOURCEGRAPH_API_URL=https://sourcegraph.com lhci collect && lhci open", "test-e2e": "TS_NODE_PROJECT=client/web/src/end-to-end/tsconfig.json mocha ./client/web/src/end-to-end/**/*.test.ts", - "cover-e2e": "nyc --hook-require=false --silent=true yarn test-e2e", + "cover-e2e": "nyc --hook-require=false --silent yarn test-e2e", "storybook": "yarn workspace @sourcegraph/storybook run start", "storybook:dll": "yarn workspace @sourcegraph/storybook run start:dll", "storybook:branded": "yarn workspace @sourcegraph/branded run storybook", @@ -45,7 +45,7 @@ "storybook:search-ui": "yarn workspace @sourcegraph/search-ui run storybook", "storybook:wildcard": "yarn workspace @sourcegraph/wildcard run storybook", "build-storybook": "yarn workspace @sourcegraph/storybook run build", - "cover-storybook": "nyc --hook-require=false yarn jest client/storybook/src/coverage", + "cover-storybook": "nyc --hook-require=false --silent yarn jest client/storybook/src/coverage", "deduplicate": "yarn-deduplicate -s fewer", "release": "cd dev/release && yarn run release", "docsite:serve": "./dev/docsite.sh -config doc/docsite.json serve -http=localhost:5080",