diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-18 12:22:40 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-18 12:22:40 +0000 |
| commit | 178aaa739a2e9a9f6ecc216b41279488a4867497 (patch) | |
| tree | e6ebb5c7b951ced8fe0e01bea9cbb53bdac12d11 | |
| parent | f3e682c03fa84adea99d55ac74e32d53164cd99b (diff) | |
| parent | c4d35a415ac381a4a9f3dc6b164855cfb1f6c43f (diff) | |
| download | gitlab-ce-178aaa739a2e9a9f6ecc216b41279488a4867497.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
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | scripts/prepare_build.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a54b38d284d..fd3a9ce0986 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' diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 68114d149c4..39806901274 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -10,7 +10,7 @@ fi # Only install knapsack after bundle install! Otherwise oddly some native # gems could not be found under some circumstance. No idea why, hours wasted. -retry gem install knapsack fog-aws mime-types +retry gem install knapsack cp config/gitlab.yml.example config/gitlab.yml |