diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-03-27 22:43:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-03-27 22:43:03 +0000 |
| commit | d4c99f644a2da2aa340aee8bc10c1dcf7c9e0d18 (patch) | |
| tree | 200253909cd6faf37a1b8809a194188451c1209a | |
| parent | bfa659bb5506c8d7ad65f312031d82519624db9c (diff) | |
| parent | baeefecb0a0e63605a2916dc005360637dd08ee0 (diff) | |
| download | gitlab-ce-d4c99f644a2da2aa340aee8bc10c1dcf7c9e0d18.tar.gz | |
Merge branch 'fix-knapsack' into 'master'
If wget fails, remove the empty file created
See merge request !10257
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 119d13cb19c..339de541bf1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,8 +103,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}' |