CircleCI: Fix master pipeline wrt front-end tests (#27681)

* CircleCI: Fix master pipeline wrt front-end tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Appease shellcheck

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
pull/27687/head
Arve Knudsen 5 years ago committed by GitHub
parent 6a14f830ba
commit 1ec8eb3fc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      .circleci/config.yml
  2. 5
      scripts/circle-test-frontend.sh

@ -860,16 +860,13 @@ jobs:
command: |
if [[ -n $CIRCLE_TAG ]]; then
# A release build
/tmp/grabpl test-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \
$CIRCLE_TAG
./scripts/circle-test-frontend.sh --edition << parameters.edition >> $CIRCLE_TAG
elif [[ $CIRCLE_BRANCH == "chore/test-release-pipeline" ]]; then
# We're testing the release pipeline
/tmp/grabpl test-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \
v7.0.0-test
./scripts/circle-test-frontend.sh --edition << parameters.edition >> v7.0.0-test
else
# A master build
/tmp/grabpl test-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" --edition << parameters.edition >> \
--build-id $CIRCLE_WORKFLOW_ID
./scripts/circle-test-frontend.sh --edition << parameters.edition >> --build-id $CIRCLE_WORKFLOW_ID
fi
- store_test_results:
path: reports/junit

@ -7,10 +7,7 @@ start=$(date +%s)
export TEST_MAX_WORKERS=2
exit_if_fail yarn run prettier:check
exit_if_fail yarn run packages:typecheck
exit_if_fail yarn run typecheck
exit_if_fail yarn run test
/tmp/grabpl test-frontend --github-token "${GITHUB_GRAFANABOT_TOKEN}" "$@"
end=$(date +%s)
seconds=$((end - start))

Loading…
Cancel
Save