From 8c2b67e32566fcaa91f19064b11106fbe6f20b05 Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Fri, 22 Nov 2024 12:12:07 +0100 Subject: [PATCH] Switch to GitLab 17.6 branch --- roles/gitlab/defaults/main.yml | 2 +- roles/gitlab/templates/gitlab/gitlab.yml.j2 | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/roles/gitlab/defaults/main.yml b/roles/gitlab/defaults/main.yml index fadd057..eaea6e6 100644 --- a/roles/gitlab/defaults/main.yml +++ b/roles/gitlab/defaults/main.yml @@ -16,7 +16,7 @@ gitlab_with_zsh: true gitlab_omniauth_enabled: false gitlab_omniauth_providers: [] -gitlab_repository_version: '17-5-stable' +gitlab_repository_version: '17-6-stable' gitlab_ce_version: '{{ gitlab_repository_version }}' gitlab_ee_version: '{{ gitlab_repository_version }}-ee' gitlab_path: "{{ gitlab_home }}/gitlab" diff --git a/roles/gitlab/templates/gitlab/gitlab.yml.j2 b/roles/gitlab/templates/gitlab/gitlab.yml.j2 index d13b0d3..df612bb 100644 --- a/roles/gitlab/templates/gitlab/gitlab.yml.j2 +++ b/roles/gitlab/templates/gitlab/gitlab.yml.j2 @@ -526,10 +526,6 @@ production: &base schedule_migrate_external_diffs_worker: cron: "15 * * * *" - # Update CI Platform Metrics daily - ci_platform_metrics_update_cron_worker: - cron: "47 9 * * *" - # Periodically update ci_runner_versions table with up-to-date versions and status. ci_runner_versions_reconciliation_worker: cron: "@daily" @@ -751,6 +747,7 @@ production: &base # private_key_file: /home/git/gitlab/config/topology-service-key.pem cell: + # id: 1 # name: cell-1 gitlab_kas: