summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-13 14:49:12 +0200
committerRémy Coutable <remy@rymai.me>2017-07-13 16:08:31 +0200
commitc4d35a415ac381a4a9f3dc6b164855cfb1f6c43f (patch)
tree8cf7c3dfb18d07f1775bd84862514e422f1711a0
parent48b976e0973066ebf2f2ffd01b1bb4a7e9d4d040 (diff)
downloadgitlab-ce-c4d35a415ac381a4a9f3dc6b164855cfb1f6c43f.tar.gz
Don't install fog-aws and mime-types gems in scripts/prepare_build.sh34915-do-not-install-fog-aws-in-prepare_build
Instead, install them only for the 'update-knapsack' job. Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--scripts/prepare_build.sh2
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