diff options
| author | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-11-09 18:23:37 +0300 |
|---|---|---|
| committer | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-11-09 18:23:37 +0300 |
| commit | 587794eb82f56cb4c20a68e80a749575cac84636 (patch) | |
| tree | 4003fdfb2d6ce770af1d8d230f5df2c5c57ef76e | |
| parent | 9737f0aa2b8ba2b6a81e886f35dae30f73fe3ba8 (diff) | |
| parent | a2b3dc0df3d5cf4b9e1fc1b9caec1b9b25da8e13 (diff) | |
Merge branch 'toon-better-test' into 'master'
testing: Add some improvements to running tests
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4986
Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Co-authored-by: Toon Claes <toon@gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | Makefile | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 664cef42f..9752897fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -443,13 +443,6 @@ trigger-qa: GITALY_SERVER_ALTERNATIVE_REPO: $CI_PROJECT_URL ee: "true" rules: - - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA != "" - when: manual - allow_failure: true - variables: - # Downstream pipeline does not fetch the merged result SHA. - # Fix: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6482 - GITALY_SERVER_VERSION: $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA - when: manual allow_failure: true @@ -382,8 +382,10 @@ debug-test-go: prepare-tests prepare-debug .PHONY: test ## Run Go benchmarks. +bench: override TEST_FORMAT := standard-verbose bench: override TEST_OPTIONS := ${TEST_OPTIONS} -bench=. -run=^$ -bench: ${BENCHMARK_REPO} test-go +bench: ${BENCHMARK_REPO} prepare-tests + ${Q}$(call run_go_tests) .PHONY: test-with-proxies test-with-proxies: override TEST_OPTIONS := ${TEST_OPTIONS} -exec ${SOURCE_DIR}/_support/bad-proxies |