canonical-ubuntu-qa team mailing list archive

[Paride Legovini <mp+464614@xxxxxxxxxxxxxxxxxx>]

Paride Legovini has proposed merging ~paride/autopkgtest-cloud:preserve-etc-hosts into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)
Related bugs:
  Bug #2019472 in Auto Package Testing: "Trailing dot in fqdn of ps5 VMs regresses some tests (e.g. postfix)"
  https://bugs.launchpad.net/auto-package-testing/+bug/2019472

For more details, see:
https://code.launchpad.net/~paride/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/464614
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~paride/autopkgtest-cloud:preserve-etc-hosts into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
index 0f60575..d11c15f 100644
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
@@ -2,7 +2,11 @@
 # Canonical/Ubuntu specific testbed setup
 
 # Remove trailing dot from the machine fqdn.
+# We also need to disable the update_etc_hosts cloud-init module:
+# setting `manage_etc_hosts: false` in /e/c/cloud.cfg does not appear
+# to be enough, as apparently the user-data can override that.
 # Workaround for LP: #2019472.
+sed -Ei '/^ +- update_etc_hosts/d' /etc/cloud/cloud.cfg
 sed -Ei '/^127\.0\.1\.1[[:blank:]]/s/([[:alnum:]])\. /\1 /' /etc/hosts
 
 RELEASE=$(lsb_release --codename --short 2>/dev/null)