canonical-ubuntu-qa team mailing list archive

[Skia <mp+464979@xxxxxxxxxxxxxxxxxx>]

Skia has proposed merging ~hyask/autopkgtest-cloud:skia/remove_fqdn_shenanigans into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~hyask/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/464979

This goes along https://salsa.debian.org/ci-team/autopkgtest/-/merge_requests/334
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~hyask/autopkgtest-cloud:skia/remove_fqdn_shenanigans 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 d11c15f..e9b3edb 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
@@ -1,14 +1,6 @@
 #!/bin/sh
 # 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)
 
 # Make the installed package versions match what is available from the configured