diff options
| -rw-r--r-- | tests/cloud_tests/instances/nocloudkvm.py | 4 | ||||
| -rw-r--r-- | tests/cloud_tests/testcases/modules/set_hostname_fqdn.py | 3 | ||||
| -rw-r--r-- | tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/cloud_tests/instances/nocloudkvm.py b/tests/cloud_tests/instances/nocloudkvm.py index 2427c856..cc825800 100644 --- a/tests/cloud_tests/instances/nocloudkvm.py +++ b/tests/cloud_tests/instances/nocloudkvm.py @@ -15,10 +15,8 @@ from tests.cloud_tests import util # This domain contains reverse lookups for hostnames that are used. # The primary reason is so sudo will return quickly when it attempts # to look up the hostname. i9n is just short for 'integration'. -# use i9n.brickies.net until i9n.cloud-init.io is populated: -# https://portal.admin.canonical.com/107125 # see also bug 1730744 for why we had to do this. -CI_DOMAIN = "i9n.brickies.net" +CI_DOMAIN = "i9n.cloud-init.io" class NoCloudKVMInstance(base.Instance): diff --git a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py index 08ceae01..eb6f0650 100644 --- a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py +++ b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py @@ -1,6 +1,7 @@ # This file is part of cloud-init. See LICENSE file for license information. """cloud-init Integration Test Verify Script.""" +from tests.cloud_tests.instances.nocloudkvm import CI_DOMAIN from tests.cloud_tests.testcases import base @@ -8,7 +9,7 @@ class TestHostnameFqdn(base.CloudTestCase): """Test Hostname module.""" ex_hostname = "cloudinit1" - ex_fqdn = "cloudinit2.i9n.brickies.net" + ex_fqdn = "cloudinit2." + CI_DOMAIN def test_hostname(self): """Test hostname output.""" diff --git a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml index 5320ac57..a85ee79e 100644 --- a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml +++ b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml @@ -7,7 +7,8 @@ cloud_config: | #cloud-config manage_etc_hosts: true hostname: cloudinit1 - fqdn: cloudinit2.i9n.brickies.net + # this needs changing if CI_DOMAIN were updated. + fqdn: cloudinit2.i9n.cloud-init.io collect_scripts: hosts: | #!/bin/bash |