From adc47f54810d43311ad78c2fec9f0fef452fa14c Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 4 Apr 2023 13:42:43 +1000 Subject: [PATCH] Upgrade Gerrit to version 3.7 This updates our base config to 3.7. This should only be merged as part of the update process described at https://etherpad.opendev.org/p/gerrit-upgrade-3.7 Change-Id: I9a1fc4a9f35ed0f60b9899cb9d08aa81995e640b --- playbooks/roles/gerrit/defaults/main.yaml | 2 +- playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/gerrit/defaults/main.yaml b/playbooks/roles/gerrit/defaults/main.yaml index 27ffd19bad..99dbe0203b 100644 --- a/playbooks/roles/gerrit/defaults/main.yaml +++ b/playbooks/roles/gerrit/defaults/main.yaml @@ -7,7 +7,7 @@ gerrit_run_init: false gerrit_run_init_dev_mode: false gerrit_run_reindex: false gerrit_packed_git_open_files: 4096 -gerrit_container_image: docker.io/opendevorg/gerrit:3.6 +gerrit_container_image: docker.io/opendevorg/gerrit:3.7 gerrit_container_volumes: - /home/gerrit2/.launchpadlib:/var/gerrit/.launchpadlib - /home/gerrit2/.ssh:/var/gerrit/.ssh diff --git a/playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 b/playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 index 6e6da7a5e9..6187ccfee8 100644 --- a/playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2 @@ -97,7 +97,7 @@ gerrit_run_init_dev_mode: true gerrit_storyboard_token: 52514e74-4b8f-4d6d-a29a-a6262f97578a gerrit_email_private_key: wjpkxebohgbid6rpuwpfrYsouxpgseluqir6yupppBczoezj gerrit_rest_token_private_key: A83fAC8x72wxcu -gerrit_container_image: "docker.io/opendevorg/gerrit:{{ zuul_test_gerrit_version | default('3.6') }}" +gerrit_container_image: "docker.io/opendevorg/gerrit:{{ zuul_test_gerrit_version | default('3.7') }}" gerrit_under_test: true gerrit_launchpad_auth: access_token: 'token'