Work around RubyGems.org timeouts

debops · Oct 9, 2017 · 6f4dea2 · 6f4dea2
1 parent 0296038
commit 6f4dea2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -35,6 +35,10 @@ Fixed
   the task "Stop gitaly service for an upgrade" tried to stop a service which
   which is created later in the run. [ypid_]
 
+- Execute the :command:`bundle install` command until it runs correctly to
+  ensure that https://rubygems.org/ timeouts don't break the installation
+  process. [drybjed_]
+
 
 `debops.gitlab v0.2.2`_ - 2017-08-16
 ------------------------------------

diff --git a/tasks/configure_gitlab_ce.yml b/tasks/configure_gitlab_ce.yml
@@ -287,8 +287,11 @@
   when: gitlab_version | version_compare("8.17", operator="ge", strict=True)
         and gitlab_register_ce_checkout|changed
 
+  # The RubyGems.org website has frequent timeouts, so we will try and install
+  # everything again as long as there are errors.
 - name: Update Ruby gems
-  command: bundle install --deployment --without {{ gitlab_ce_bundle_install_without[gitlab__database] }}
+  shell: until bundle install --deployment --without {{ gitlab_ce_bundle_install_without[gitlab__database] }} ; do
+         sleep 1 ; logger -t ansible-command-bundle "GitLab RubyGems installation failed, retrying..." ; done
   args:
     chdir: '{{ gitlab_ce_git_checkout }}'
   become: True