From 08644ae925c8c6c8e722b5fe6e163a44cd5a7828 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 7 Jul 2022 13:21:32 +1000 Subject: [PATCH] mirror-update: move testing to mirror-update99 Keeping the testing nodes at the other end of the namespace separates them from production hosts. This one isn't really referencing itself in testing like many others, but move it anyway. Change-Id: I2130829a5f913f8c7ecd8b8dfd0a11da3ce245a9 --- playbooks/zuul/run-base.yaml | 2 +- ...opendev.org.yaml.j2 => mirror-update99.opendev.org.yaml.j2} | 0 testinfra/test_mirror-update.py | 2 +- zuul.d/system-config-run.yaml | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-) rename playbooks/zuul/templates/host_vars/{mirror-update01.opendev.org.yaml.j2 => mirror-update99.opendev.org.yaml.j2} (100%) diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml index a9a5aabd4f..b51ba2b977 100644 --- a/playbooks/zuul/run-base.yaml +++ b/playbooks/zuul/run-base.yaml @@ -147,7 +147,7 @@ - host_vars/grafana01.opendev.org.yaml - host_vars/mirror01.openafs.provider.opendev.org.yaml - host_vars/mirror02.openafs.provider.opendev.org.yaml - - host_vars/mirror-update01.opendev.org.yaml + - host_vars/mirror-update99.opendev.org.yaml - host_vars/paste99.opendev.org.yaml - host_vars/refstack01.openstack.org.yaml - host_vars/review99.opendev.org.yaml diff --git a/playbooks/zuul/templates/host_vars/mirror-update01.opendev.org.yaml.j2 b/playbooks/zuul/templates/host_vars/mirror-update99.opendev.org.yaml.j2 similarity index 100% rename from playbooks/zuul/templates/host_vars/mirror-update01.opendev.org.yaml.j2 rename to playbooks/zuul/templates/host_vars/mirror-update99.opendev.org.yaml.j2 diff --git a/testinfra/test_mirror-update.py b/testinfra/test_mirror-update.py index 93c144ebf9..b5696dce4d 100644 --- a/testinfra/test_mirror-update.py +++ b/testinfra/test_mirror-update.py @@ -13,7 +13,7 @@ # under the License. -testinfra_hosts = ['mirror-update01.opendev.org'] +testinfra_hosts = ['mirror-update99.opendev.org'] # Manually calculated from the "secret" value in the test host vars KEYTAB_SHA256 = '88d4ac38ad3da024913843d8917d5be89ceac4abef7b977718f2c3f1db3ccde4' diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 858fbfafc7..eb5ead9920 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -473,7 +473,7 @@ nodes: - name: bridge.openstack.org label: ubuntu-bionic - - name: mirror-update01.opendev.org + - name: mirror-update99.opendev.org label: ubuntu-focal vars: run_playbooks: @@ -484,6 +484,7 @@ - playbooks/roles/mirror-update/ - playbooks/roles/reprepro/ - playbooks/service-mirror-update.yaml + - playbooks/zuul/templates/host_vars/mirror-update99.opendev.org.yaml.j2 - testinfra/test_mirror-update.py - job: