Merge "Switch test gerrit hostname to review99.opendev.org"

inventory/service/groups.yaml

@@ -24,6 +24,11 @@ groups:
     - kdc03.openstack.org
     - eavesdrop01.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
     # as they are puppet and should be replaced "soon"
     - ethercalc02.openstack.org

playbooks/roles/letsencrypt-create-certs/handlers/main.yaml

@@ -255,6 +255,9 @@
 - name: letsencrypt updated ptg-opendev-org-main
   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
 # This allows us to do a rolling restart of the gitea backends.
 - name: letsencrypt updated gitea01-main

playbooks/zuul/run-base.yaml

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

playbooks/zuul/templates/host_vars/review99.opendev.org.yaml.j2

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

testinfra/test_gerrit.py

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

zuul.d/system-config-run.yaml

@@ -873,7 +873,7 @@
       nodes:
         - name: bridge.openstack.org
           label: ubuntu-bionic
-        - name: review02.opendev.org
+        - name: review99.opendev.org
           label: ubuntu-focal
     required-projects:
       - openstack/project-config
@@ -884,7 +884,7 @@
         - playbooks/service-review.yaml
       run_test_playbook: playbooks/test-review.yaml
     host-vars:
-      review02.opendev.org:
+      review99.opendev.org:
         host_copy_output:
           '/home/gerrit2/review_site/etc': logs
           '/home/gerrit2/review_site/logs': logs
@@ -903,7 +903,7 @@
       - playbooks/roles/letsencrypt
       - playbooks/roles/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/
       - testinfra/test_gerrit.py
       - docker/gerrit/