diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-03-29 00:22:52 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-29 00:22:52 +0800 |
| commit | 1badaaf476db25974d9eb4119dcd9e7442086319 (patch) | |
| tree | c0372318fcbb148712e1f617aadfddbf2f2398e5 /.gitlab-ci.yml | |
| parent | a236e4132e92304ee5d77f507fb98b3f98fd03bd (diff) | |
| parent | 1bec2fb3b84c0514453e94ef50555be0081bc84d (diff) | |
| download | gitlab-ce-1badaaf476db25974d9eb4119dcd9e7442086319.tar.gz | |
Merge remote-tracking branch 'upstream/master' into test-pg-mysql
* upstream/master: (43 commits)
Update CHANGELOG.md for 9.0.1
Support wider range of monitored environments with Prometheus
Add changelog entry
Don't include branch name in Knapsack report file
Add a new `stub_mattermost_setting` stub helper to properly stub Mattermost settings
Fixed issue boards sidebar alignment
Fixed alignment of tooltip on card assignee
Stops triggering board sidebar when clicking avatar
Get rid of a third N+1 query problem
Get rid of second N+1 query problem
Get rid of a first N+1 query problem
Add N+1 query problem specs for Issue and MergeRequest ReferenceFilter classes
Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`
Use `:empty_project` where possible in service specs
Adds entry about kebab case props in documentation
Fix sub-nav highlighting for `Environments` and `Jobs` pages
spread out webpack bundles per-line to reduce conflicts in EE
Improve UX guide on tooltips
Correct example value variable name.
If wget fails, remove the empty file created
...
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad643b41a8f..c2c1668a761 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,8 @@ variables: GIT_DEPTH: "20" PHANTOMJS_VERSION: "2.1.1" GET_SOURCES_ATTEMPTS: "3" - KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-${CI_COMMIT_REF_SLUG}.json - KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-${CI_COMMIT_REF_SLUG}.json + KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json + KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-master.json before_script: - bundle --version @@ -133,8 +133,8 @@ knapsack: stage: prepare script: - mkdir -p knapsack/${CI_PROJECT_NAME}/ - - wget -O $KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${KNAPSACK_S3_BUCKET}.s3.amazonaws.com/$KNAPSACK_RSPEC_SUITE_REPORT_PATH || true - - wget -O $KNAPSACK_SPINACH_SUITE_REPORT_PATH http://${KNAPSACK_S3_BUCKET}.s3.amazonaws.com/$KNAPSACK_SPINACH_SUITE_REPORT_PATH || true + - wget -O $KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${KNAPSACK_S3_BUCKET}.s3.amazonaws.com/$KNAPSACK_RSPEC_SUITE_REPORT_PATH || rm $KNAPSACK_RSPEC_SUITE_REPORT_PATH + - wget -O $KNAPSACK_SPINACH_SUITE_REPORT_PATH http://${KNAPSACK_S3_BUCKET}.s3.amazonaws.com/$KNAPSACK_SPINACH_SUITE_REPORT_PATH || rm $KNAPSACK_SPINACH_SUITE_REPORT_PATH - '[[ -f $KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${KNAPSACK_RSPEC_SUITE_REPORT_PATH}' - '[[ -f $KNAPSACK_SPINACH_SUITE_REPORT_PATH ]] || echo "{}" > ${KNAPSACK_SPINACH_SUITE_REPORT_PATH}' |