Merge "Update Gerrit to version 3.6"

playbooks/roles/gerrit/defaults/main.yaml

@@ -6,7 +6,7 @@ gerrit_run_compose_up: false
 gerrit_run_init: false
 gerrit_run_init_dev_mode: false
 gerrit_packed_git_open_files: 4096
-gerrit_container_image: docker.io/opendevorg/gerrit:3.5
+gerrit_container_image: docker.io/opendevorg/gerrit:3.6
 gerrit_container_volumes:
   - /home/gerrit2/.launchpadlib:/var/gerrit/.launchpadlib
   - /home/gerrit2/.ssh:/var/gerrit/.ssh

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.5') }}"
+gerrit_container_image: "docker.io/opendevorg/gerrit:{{ zuul_test_gerrit_version | default('3.6') }}"
 gerrit_under_test: true
 gerrit_launchpad_auth:
   access_token: 'token'