summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-07-22 07:47:58 +0000
committerRémy Coutable <remy@rymai.me>2019-07-22 07:47:58 +0000
commit441a339aef4df164ee387b125f3a31c9021132ec (patch)
treeaac4abe7208db2dcd4156332d7791947a7e930d0
parentc5fac1034f43d81a17242d8ade2d7eb8741a72e2 (diff)
parent4d4d003451aca23a4e050bdda45b2dffa50f440a (diff)
downloadgitlab-ce-441a339aef4df164ee387b125f3a31c9021132ec.tar.gz
Merge branch '64428-tests-are-not-split-optimally-by-knapsack' into 'master'
Upload new Knapsack report instead of merging Closes #64428 See merge request gitlab-org/gitlab-ce!30612
-rw-r--r--.gitlab/ci/test-metadata.gitlab-ci.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml
index 2454ea85652..b5201f97366 100644
--- a/.gitlab/ci/test-metadata.gitlab-ci.yml
+++ b/.gitlab/ci/test-metadata.gitlab-ci.yml
@@ -39,6 +39,7 @@ update-tests-metadata:
policy: push
script:
- retry gem install fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document
+ - echo "{}" > ${KNAPSACK_RSPEC_SUITE_REPORT_PATH}'
- scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec_*_pg_node_*.json
- '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $KNAPSACK_RSPEC_SUITE_REPORT_PATH'
- rm -f knapsack/${CI_PROJECT_NAME}/*_node_*.json