diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-08 09:09:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-08 09:09:39 +0000 |
| commit | 5bdbc604c8a08f827c3833e2c28ec0c299bb41fc (patch) | |
| tree | 1fbf5e5dc3bff54d371baa15775371ebc8525f62 /scripts | |
| parent | 79ddf163588de2d9a7f1cc27262dc1a14503f619 (diff) | |
| download | gitlab-ce-5bdbc604c8a08f827c3833e2c28ec0c299bb41fc.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rspec_helpers.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh index e0cce46fb6b..622389f34b6 100644 --- a/scripts/rspec_helpers.sh +++ b/scripts/rspec_helpers.sh @@ -73,6 +73,12 @@ function rspec_paralellized_job() { export KNAPSACK_LOG_LEVEL="debug" export KNAPSACK_REPORT_PATH="knapsack/${report_name}_report.json" + # There's a bug where artifacts are sometimes not downloaded. Since specs can run without the Knapsack report, we can + # handle the missing artifact gracefully here. See https://gitlab.com/gitlab-org/gitlab/-/issues/212349. + if [[ ! -f "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" ]]; then + echo "{}" > "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" + fi + cp "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" "${KNAPSACK_REPORT_PATH}" if [[ -z "${KNAPSACK_TEST_FILE_PATTERN}" ]]; then |