From 595dfd11667b6cfcacab2dbe048f30e8916b0a5a Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 14 Dec 2020 08:25:22 +1100
Subject: [PATCH] system-config-run-review: remove review-dev server

We don't need to test two servers in this test; remove review-dev.
Consensus seems to be this was for testing plans that have now been
superseded.

Change-Id: Ia4db5e0748e1c82838000c9b655808c3d8b74461
---
 playbooks/zuul/run-base.yaml                  |  1 -
 .../templates/group_vars/review-dev.yaml.j2   | 96 -------------------
 testinfra/test_gerrit.py                      |  1 -
 zuul.d/system-config-run.yaml                 |  8 --
 4 files changed, 106 deletions(-)
 delete mode 100644 playbooks/zuul/templates/group_vars/review-dev.yaml.j2

diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml
index 42d7bd1d16..683bbad2e1 100644
--- a/playbooks/zuul/run-base.yaml
+++ b/playbooks/zuul/run-base.yaml
@@ -60,7 +60,6 @@
         - group_vars/nodepool-launcher.yaml
         - group_vars/registry.yaml
         - group_vars/review.yaml
-        - group_vars/review-dev.yaml
         - group_vars/control-plane-clouds.yaml
         - group_vars/afs-client.yaml
         - group_vars/zuul.yaml
diff --git a/playbooks/zuul/templates/group_vars/review-dev.yaml.j2 b/playbooks/zuul/templates/group_vars/review-dev.yaml.j2
deleted file mode 100644
index fd04e8fe37..0000000000
--- a/playbooks/zuul/templates/group_vars/review-dev.yaml.j2
+++ /dev/null
@@ -1,96 +0,0 @@
-gerrit_dev_ssh_rsa_key_contents: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEAvqQkJUwEGJgqzmOmj2728ikA3Dgl4mzzRiI5zzzLhCLQktL7
-  UZ6hAc+851mUuQ66vciqUToerhRdNWqNlZzY8On/jXUTVdfUVlXupmDfqmtlax9n
-  Gi8Aayj4h9F3P3iuNQ+eXWVOyFsCmAMPzaYgWgXx2rxcIqSPq5hG+vDB9oXIpg3a
-  /244vtIZId1/uNnZDb5jHbZLglupynQBIZ12h2XOUiUfxL84EQnwfL2zC9d6eOjv
-  cYaCYJ+2VrzG972keY8SJEMLLVEd+q2hFYbbQQxLlmrFpx2G6zNc3d6KLnW0xEH+
-  b1yEmShcoB8iRRam+IkO+ovoQ5W9FUCmQnWqJQIDAQABAoIBAQCABKeFKDPD9EMi
-  j0ZlIUXRPfmm6EmAcFs46Hjbkl60H9DiF63OlHBYUBDxZnV5g8ug8CR3IUlC6sfg
-  u+nR4x7HQMtsSYcvaRzc0R3OOlVYEoBrXA4XRiLI0x15zw593+NUHGXjH8m0v3DR
-  dZTiK0GkUkOj+EMCvHEB8OMRViVaDjel+TXI6lM2UuexpYLag/u+GotDUQ8sjq4v
-  kT2FWzrZAGHih98oZ7AflinasGjMBr21lCRq/u3w0ieU4ZPmxpLxz9EUbWS06kQe
-  W2pafIhDq+4mVtDuhmb87yMMpda+TCBcCRCzA3MGDMGVzQgQvPe49R4EPRWzBWXU
-  vso8JSzBAoGBAPrDobXukDJ0j2zD3Cw7xCSJy3foU4sdQF5yxeIWox1gfsgkAhn2
-  zxmuewdfdh0hZAnZWZ41sJzFrEhrvTV/wFIfIZ2qlMf3q3ZdG8c0CQ6E3blsAF8g
-  jExgck8mV2kvZItowS8JCdWvNw1zpwNJ8Ae+mMUSMBKbs5hzO8X0V1FxAoGBAMKf
-  JNjqN/LegvlnfFXMPM+vo39MX2RsukwmTZT6msMi3rNgN3oekXSpOK1Mkftrd/wL
-  B5Vp9Nl3d3kFu3bTKA+N8bjtokXfN+fF9zPFeLwOfEOEtQlnvzb/XF4LhSGiq7Kg
-  OP6/4udaa9cr9yLE7jTDoLTiyRP796k4ADGRo8n1AoGBAPad0XsAbPYCJk/ca7tg
-  5+zbS6zYYtlM4lJA5BYPF0o77VPd/ecVEOZ772j33EyX2y/If1eWC+SSj3YF52Yn
-  Brh8/211Jq9nB0z4EuqdZU7PItRJwC/N7czriWAIIC1FO8fTNTKR3Ac4M5daJ2WX
-  oKWtL8eYtIiIcl867Q0o2XsxAoGAHtJrWHsHb0wz++GavE/DFbUgNInY1aOugV7T
-  jJN/rQW5tTi4sHtk18/w7OkieWnUr7LjeZM1NreH0T/KJ5BbWNNHA92GhIBMb0VX
-  1/gfHdFBdsPuk9W9X61jaHV0mRYVEQ302Mt02OTmDUamNfhwLSUKL3t3EtYlq8P1
-  q+P/x30CgYEAiLaGdCtlPy5e35ULD/Ep73kOB1uRVtF4JlVpqZ4CygVoCguSZ3Sd
-  pHMmNylg7j2NyL/9aLKs1NzdGBxpxVa5A4vgcr1DjoS1cuRVEiQoSkI6D6DCmENA
-  Pb95AevPUxqqAKNZYsj4yDsXnmbFSHARijPWcpfkCDJmVhMFPObr4OE=
-  -----END RSA PRIVATE KEY-----
-gerrit_dev_ssh_rsa_pubkey_contents: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+pCQlTAQYmCrOY6aPbvbyKQDcOCXibPNGIjnPPMuEItCS0vtRnqEBz7znWZS5Drq9yKpROh6uFF01ao2VnNjw6f+NdRNV19RWVe6mYN+qa2VrH2caLwBrKPiH0Xc/eK41D55dZU7IWwKYAw/NpiBaBfHavFwipI+rmEb68MH2hcimDdr/bji+0hkh3X+42dkNvmMdtkuCW6nKdAEhnXaHZc5SJR/EvzgRCfB8vbML13p46O9xhoJgn7ZWvMb3vaR5jxIkQwstUR36raEVhttBDEuWasWnHYbrM1zd3ooudbTEQf5vXISZKFygHyJFFqb4iQ76i+hDlb0VQKZCdaol gerrit-code-review@829f141b0fa5
-gerrit_dev_project_ssh_rsa_key_contents: |
-  -----BEGIN OPENSSH PRIVATE KEY-----
-  b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
-  NhAAAAAwEAAQAAAQEAwXPLGVuaJ9lEtbOgGjwTFQM6iJUnS4ImV+sKRbNNPSFNFYuzmZ5j
-  6snl8Wa6SssIYHfcOp0PTeM6ipyJ/md0WrmUutDgds+LoSqjh7zS+FQ/DgP5yAzw+aD4BQ
-  SgD1UgdCgNGtK4iyRDvBBTLfmKN9KeVrbrPewTrLC5aWRQZ74h5RZk60HYB31z3N/ZU6oE
-  hCNynfn2s43dGY2IS5O2AcMN/Pw8NFYetTgZyBk4ckH3euw0WxcaDI/FRh0OdQX3tRitOh
-  f1setHgEy/vOk2Eo4U8OX52JivAjAAPimJFbaEqnoc9dcJea4Gp1I7E9GNbCDqAh5dMl3L
-  LXXW7xsC/QAAA9jUTinD1E4pwwAAAAdzc2gtcnNhAAABAQDBc8sZW5on2US1s6AaPBMVAz
-  qIlSdLgiZX6wpFs009IU0Vi7OZnmPqyeXxZrpKywhgd9w6nQ9N4zqKnIn+Z3RauZS60OB2
-  z4uhKqOHvNL4VD8OA/nIDPD5oPgFBKAPVSB0KA0a0riLJEO8EFMt+Yo30p5Wtus97BOssL
-  lpZFBnviHlFmTrQdgHfXPc39lTqgSEI3Kd+fazjd0ZjYhLk7YBww38/Dw0Vh61OBnIGThy
-  Qfd67DRbFxoMj8VGHQ51Bfe1GK06F/Wx60eATL+86TYSjhTw5fnYmK8CMAA+KYkVtoSqeh
-  z11wl5rganUjsT0Y1sIOoCHl0yXcstddbvGwL9AAAAAwEAAQAAAQBgnY8yw/AStM0/Hk34
-  rEYveWRTcIKmkILL6ARCWVFbFXWlLBdvwo5OZbVkwhSKZCpz24ju8SACm1jSf2nf2BVhdk
-  wUnVttmyw2OtBfa2vGQHUZb9zhD62OTtlv0CaMYcyKlrIs0k7+lwcJNvIEBRwF0zfnQQXt
-  8CjHV5/SRhpuJMQwDx50qiu4jvSlRIrDBuJRD31Rb1q3thM13MAaVNVRIVdBuHJtTiQZzA
-  +4SmLpM09ooXQh93DlIuou2u/kx41wJCw6aS38KD/jX25geqShhOOU9n+yaqnJUzigyiXp
-  p+c8GZeusLu8KmLpMOzAJS14g4pDLxhwfFCPXj3cNyXVAAAAgFTPmHnEL9GMW9GVVLIWSY
-  XzY0gRqDice8WQ06qdDIfcS+f3QaRxp6woLICzzkpVzHCi6VF4H9wk2ZCk3rAgbEfhYVzR
-  J3/C/DtA3bz/921oAmN9ha/BBwsBBhiBghbnCIQcMzCaBuOMyGDkOplz+MflTtjFYVXhZK
-  AWn0YVksUeAAAAgQD9JL9Lr/poKcHsSMXp/xjw7xRQ00uhRILlLbiCalvOAT8mGBhTkaad
-  IpZ2WY6wlM65qkbdNk4zh1cLGNPQFXaixftyQ/LPFggFbFa+N9n/IJZlN1dubXBurJ5aQz
-  b3rOZ5UbE5O7tQdOI64zHrlZa4CAEkdMnBcrs17zPxf/5pcwAAAIEAw6Kd5KqEVrL/0ulu
-  OaLobiVZOnP169JiGUOYeHIr7z6uj3Mzo2MqAivtoFzzO7pEoR94ZqBrfcvLgfd/dIvJOT
-  u4JwE1iI2GozbLb7cXoyjsiEx02KuoLOf59DmLHBlLbTsSpXuMzttPj7Ob3VMWgaiJhpGt
-  Jhh2wHtj9tM5hc8AAAAgbW9yZHJlZEBNb250eXMtTWFjQm9vay1BaXIubG9jYWwBAgM=
-  -----END OPENSSH PRIVATE KEY-----
-gerrit_dev_project_ssh_rsa_pubkey_contents: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBc8sZW5on2US1s6AaPBMVAzqIlSdLgiZX6wpFs009IU0Vi7OZnmPqyeXxZrpKywhgd9w6nQ9N4zqKnIn+Z3RauZS60OB2z4uhKqOHvNL4VD8OA/nIDPD5oPgFBKAPVSB0KA0a0riLJEO8EFMt+Yo30p5Wtus97BOssLlpZFBnviHlFmTrQdgHfXPc39lTqgSEI3Kd+fazjd0ZjYhLk7YBww38/Dw0Vh61OBnIGThyQfd67DRbFxoMj8VGHQ51Bfe1GK06F/Wx60eATL+86TYSjhTw5fnYmK8CMAA+KYkVtoSqehz11wl5rganUjsT0Y1sIOoCHl0yXcstddbvGwL9 gerrit-code-review-dev-project
-gerrit_dev_replication_ssh_rsa_key_contents: |
-  -----BEGIN OPENSSH PRIVATE KEY-----
-  b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
-  NhAAAAAwEAAQAAAQEA4Ji+hAbjC6Dsn+nOel5lSpmUs2aFml54riR72sI/e3hLN77QSCUT
-  TCNZRj+AZZ6RnijNdCCcTGZrFKOdpXsra6/vYVu3uFo2qP09wrEuiYhHS04cHhGVokxk5V
-  C3iQ6oJ7wurVKMcOs1GxudLecLS8yVvVhXWjWsrFiTg1VRCHxcGHv4q5rKNExn1uVO+jRB
-  gp03dN1nfRmrnTJyLzigz3qvB+FYHwu9FosTT13uiUewmucOIY/xlKxJ3pxhS2YDpOhruv
-  Arir8iIeJJsvoCUJcEy0q8vVlm2GZrKdaciVOjXU2+PNvbCWMncdP246Vmfia1whTdqXnM
-  3hkFuIYxHQAAA9gx5YolMeWKJQAAAAdzc2gtcnNhAAABAQDgmL6EBuMLoOyf6c56XmVKmZ
-  SzZoWaXniuJHvawj97eEs3vtBIJRNMI1lGP4BlnpGeKM10IJxMZmsUo52leytrr+9hW7e4
-  Wjao/T3CsS6JiEdLThweEZWiTGTlULeJDqgnvC6tUoxw6zUbG50t5wtLzJW9WFdaNaysWJ
-  ODVVEIfFwYe/irmso0TGfW5U76NEGCnTd03Wd9GaudMnIvOKDPeq8H4VgfC70WixNPXe6J
-  R7Ca5w4hj/GUrEnenGFLZgOk6Gu68CuKvyIh4kmy+gJQlwTLSry9WWbYZmsp1pyJU6NdTb
-  4829sJYydx0/bjpWZ+JrXCFN2peczeGQW4hjEdAAAAAwEAAQAAAQEAnrLPS7MiE0FuccBf
-  qY+xuviyXeF/XgiK9WHKMlU3TiM94vHtckzgSdhgaIbOTv+wnTTvl7LDPijQWRETf658i+
-  cRGpYYRydXoCjwzvUrkPq+hbN3oreCJ+AbGv3h8fJtV0ZdJRNDMTbBm5nzgk/TZ4fz9orJ
-  jnCGxnEAKrjKPVdu2tnxouvah82IIZ0UOqWCFoU02FeAmhakEzycwFiTGT6uwrcLr/Pu4q
-  9YTgyM9xSDMmS/l5wvH0jbNU6RF8zuajleO7PzeSJzyCD7293SugfYv6mvvTCv6APywqeo
-  2i9MpO2NbajqriZgZ/vC/8nHleFLLU3VI1YWeVPfQQtP8QAAAIB7J6b1P4ItkBk1SEQONc
-  9hXMjfn92fMv7KPi9mD3SICOUfaapCt5UHNP/G/lvOHfgm5AjV/lkz/YYHisxBP54pRsTg
-  tkxyCtexzZz8jnFLJIpw8uHB0QOkeMwDF4Gfb8yTBPAsStV3yU2yxJFCwoTObIOL0LS9Ov
-  3k4C1ViWpriQAAAIEA/HifwRHOZ0YSr1pqGIs2WPIak+5Wzuhya+ZbJPdvik3WRL1JKd6d
-  bqWDYY2QAWZ0bC3epFhAlM5hoRcF94wPzdwvLjAASBBkm9xF7i2eJXKIkloiyzwvneqBi3
-  TyVigAUtE9HoQqQwqY00gKNEZLKs4kDRwTvH2s37xbNvoAf6cAAACBAOO8YZ7+2H8JsHHX
-  Lm1Aszq8TC2tgjwNSGrNPMyrvNzTfng2+Gyo2YQHS9+tel4RdWLFTriShAUfUWPR54geCO
-  Q27166ZrSMbmYbChTSUwDYg5XY6wD3tSfmYGFzP1w9UzA9MtHEYOFN7R7FFeDNFvgt09Fo
-  /VW0ZUYHTbyVpMGbAAAAIG1vcmRyZWRATW9udHlzLU1hY0Jvb2stQWlyLmxvY2FsAQI=
-  -----END OPENSSH PRIVATE KEY-----
-gerrit_dev_replication_ssh_rsa_pubkey_contents: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDgmL6EBuMLoOyf6c56XmVKmZSzZoWaXniuJHvawj97eEs3vtBIJRNMI1lGP4BlnpGeKM10IJxMZmsUo52leytrr+9hW7e4Wjao/T3CsS6JiEdLThweEZWiTGTlULeJDqgnvC6tUoxw6zUbG50t5wtLzJW9WFdaNaysWJODVVEIfFwYe/irmso0TGfW5U76NEGCnTd03Wd9GaudMnIvOKDPeq8H4VgfC70WixNPXe6JR7Ca5w4hj/GUrEnenGFLZgOk6Gu68CuKvyIh4kmy+gJQlwTLSry9WWbYZmsp1pyJU6NdTb4829sJYydx0/bjpWZ+JrXCFN2peczeGQW4hjEd gerrit-code-review-dev-replication
-gerrit_database_type: h2
-gerrit_run_compose_up: true
-gerrit_run_init: true
-gerrit_dev_storyboard_token: 4020000c-d1b9-4173-ab33-2f55dbc1c718
-gerrit_dev_email_private_key: xxj2lTapostsobbxvpawhjhnzufaGxchrypoddcafqarrq5h
-# These are here so that interpolation works in the main playbook. They
-# are not directly used in the gerrit config.
-gerrit_dev_mysql_host: unused
-gerrit_dev_mysql_password: unused
diff --git a/testinfra/test_gerrit.py b/testinfra/test_gerrit.py
index c9b72ac152..3a6adb9d6e 100644
--- a/testinfra/test_gerrit.py
+++ b/testinfra/test_gerrit.py
@@ -14,7 +14,6 @@
 
 
 testinfra_hosts = [
-    'review-dev01.opendev.org',
     'review01.opendev.org',
 ]
 
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 2c84860c3f..3497b63c77 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -826,8 +826,6 @@
           label: ubuntu-bionic
         - name: review01.openstack.org
           label: ubuntu-xenial
-        - name: review-dev01.opendev.org
-          label: ubuntu-xenial
     required-projects:
       - openstack/project-config
       - opendev/system-config
@@ -837,12 +835,6 @@
         - playbooks/service-review-dev.yaml
         - playbooks/service-review.yaml
     host-vars:
-      review-dev01.opendev.org:
-        host_copy_output:
-          '/home/gerrit2/review_site/etc': logs
-          '/home/gerrit2/review_site/logs': logs
-          '/var/log/apache2/': logs
-          '/var/log/acme.sh': logs
       review01.openstack.org:
         host_copy_output:
           '/home/gerrit2/review_site/etc': logs