Switch test gerrit hostname to review99.opendev.org

Previously we had set up the test gerrit instance to use the same
hostname as production: review02.opendev.org. This causes some confusion
as we have to override settings specifically for testing like a reduced
heap size, but then also copy settings from the prod host vars as we
override the host vars entirely. Using a new hostname allows us to use a
different set of host vars with unique values reducing confusion.

Change-Id: I4b95bbe1bde29228164a66f2d3b648062423e294
This commit is contained in:
Clark Boylan 2021-10-12 09:26:44 -07:00
parent 76baae4e3f
commit 63f5674e6f
6 changed files with 15 additions and 7 deletions

View File

@ -24,6 +24,11 @@ groups:
- kdc03.openstack.org - kdc03.openstack.org
- eavesdrop01.opendev.org - eavesdrop01.opendev.org
- paste01.opendev.org - paste01.opendev.org
# These are test specific hosts that we add to the backup
# group to mimic as much as possible what their prod version
# end up doing.
- gitea99.opendev.org
- review99.opendev.org
# All these servers are "special-cased" in specifically # All these servers are "special-cased" in specifically
# as they are puppet and should be replaced "soon" # as they are puppet and should be replaced "soon"
- ethercalc02.openstack.org - ethercalc02.openstack.org

View File

@ -255,6 +255,9 @@
- name: letsencrypt updated ptg-opendev-org-main - name: letsencrypt updated ptg-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated review99-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
# We split out handlers for each gitea host as handlers should be run in order # We split out handlers for each gitea host as handlers should be run in order
# This allows us to do a rolling restart of the gitea backends. # This allows us to do a rolling restart of the gitea backends.
- name: letsencrypt updated gitea01-main - name: letsencrypt updated gitea01-main

View File

@ -86,7 +86,7 @@
- host_vars/mirror-update01.opendev.org.yaml - host_vars/mirror-update01.opendev.org.yaml
- host_vars/paste01.opendev.org.yaml - host_vars/paste01.opendev.org.yaml
- host_vars/refstack01.openstack.org.yaml - host_vars/refstack01.openstack.org.yaml
- host_vars/review02.opendev.org.yaml - host_vars/review99.opendev.org.yaml
- name: Display group membership - name: Display group membership
command: ansible localhost -m debug -a 'var=groups' command: ansible localhost -m debug -a 'var=groups'
- name: Run base.yaml - name: Run base.yaml

View File

@ -111,7 +111,7 @@ gerrit_replication: []
gerrit_serverid: a3593e8f-50c5-4336-a802-c2ffa22ba0fa gerrit_serverid: a3593e8f-50c5-4336-a802-c2ffa22ba0fa
gerrit_heap_limit: 6g gerrit_heap_limit: 6g
letsencrypt_certs: letsencrypt_certs:
review02-opendev-org-main: review99-opendev-org-main:
- review.opendev.org - review.opendev.org
- review02.opendev.org - review99.opendev.org
- review.openstack.org - review.openstack.org

View File

@ -17,7 +17,7 @@ import time
from util import take_screenshots from util import take_screenshots
testinfra_hosts = [ testinfra_hosts = [
'review02.opendev.org', 'review99.opendev.org',
] ]

View File

@ -852,7 +852,7 @@
nodes: nodes:
- name: bridge.openstack.org - name: bridge.openstack.org
label: ubuntu-bionic label: ubuntu-bionic
- name: review02.opendev.org - name: review99.opendev.org
label: ubuntu-focal label: ubuntu-focal
required-projects: required-projects:
- openstack/project-config - openstack/project-config
@ -863,7 +863,7 @@
- playbooks/service-review.yaml - playbooks/service-review.yaml
run_test_playbook: playbooks/test-review.yaml run_test_playbook: playbooks/test-review.yaml
host-vars: host-vars:
review02.opendev.org: review99.opendev.org:
host_copy_output: host_copy_output:
'/home/gerrit2/review_site/etc': logs '/home/gerrit2/review_site/etc': logs
'/home/gerrit2/review_site/logs': logs '/home/gerrit2/review_site/logs': logs
@ -882,7 +882,7 @@
- playbooks/roles/letsencrypt - playbooks/roles/letsencrypt
- playbooks/roles/gerrit/ - playbooks/roles/gerrit/
- playbooks/zuul/gerrit/ - playbooks/zuul/gerrit/
- playbooks/zuul/templates/host_vars/review02.opendev.org.yaml.j2 - playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2
- roles/bazelisk-build/ - roles/bazelisk-build/
- testinfra/test_gerrit.py - testinfra/test_gerrit.py
- docker/gerrit/ - docker/gerrit/