gitlab: 14.1.2 -> 14.2.1

(cherry picked from commit 99387372d5af951fa7ab1cad970b7bef83b6b91c)
2021-08-28 16:03:12 +02:00
parent 7d46ea4c96
commit 2572e2550a
14 changed files with 263 additions and 320 deletions
@@ -147,7 +147,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
      )
      gitlab.succeed("systemd-tmpfiles --create")
      gitlab.succeed("rm -rf ${nodes.gitlab.config.services.postgresql.dataDir}")
-      gitlab.systemctl("start gitlab-config.service gitlab-postgresql.service")
+      gitlab.systemctl("start gitlab-config.service gitaly.service gitlab-postgresql.service")
+      gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/tmp/sockets/gitaly.socket")
      gitlab.succeed(
          "sudo -u gitlab -H gitlab-rake gitlab:backup:restore RAILS_ENV=production BACKUP=dump force=yes"
      )