diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-18 12:22:40 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-07-20 17:04:18 -0500 |
| commit | 33739d3315235699b3840465edc9ba7da2c45f27 (patch) | |
| tree | 14726dac23e4172f2d86de95eaf20fe9ea48f91a /.gitlab-ci.yml | |
| parent | 290306f314d27fb29d439ec1187678554a3fd7f9 (diff) | |
| download | gitlab-ce-33739d3315235699b3840465edc9ba7da2c45f27.tar.gz | |
Merge branch '34915-do-not-install-fog-aws-in-prepare_build' into 'master'
Resolve "Test/Production environment imparity in nokogiri"
Closes #34915
See merge request !12842
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8466edb1981..f67f95e5fe1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,6 +180,7 @@ update-knapsack: <<: *only-canonical-masters stage: post-test script: + - retry gem install fog-aws mime-types - scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec-pg_node_*.json - scripts/merge-reports ${KNAPSACK_SPINACH_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/spinach-pg_node_*.json - '[[ -z ${KNAPSACK_S3_BUCKET} ]] || scripts/sync-reports put $KNAPSACK_S3_BUCKET $KNAPSACK_RSPEC_SUITE_REPORT_PATH $KNAPSACK_SPINACH_SUITE_REPORT_PATH' |