canonical-ubuntu-qa team mailing list archive

[Brian Murray <mp+444313@xxxxxxxxxxxxxxxxxx>]

Brian Murray has proposed merging autopkgtest-cloud:staging-net-name into autopkgtest-cloud:master.

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

For more details, see:
https://code.launchpad.net/~ubuntu-release/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/444313

Instead of modifying the code for different network names as in https://code.launchpad.net/~ubuntu-release/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/444308, I opted to rename the PS45 staging network name to match that of PS5's staging network name.

Subsequently, it was necessary to change the network name in the service bundle so the correct net-name.rc file and worker-$REGION-$ARCH.conf files were written. (Haha - however the worker*.conf files weren't really updated when net-name changed - bug coming.)
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of autopkgtest-cloud:staging-net-name into autopkgtest-cloud:master.

diff --git a/mojo/service-bundle b/mojo/service-bundle
index d7d8e9c..50018fb 100644
--- a/mojo/service-bundle
+++ b/mojo/service-bundle
@@ -72,7 +72,7 @@ applications:
 {%- if stage_name == "production" %}
             net-name: net_prod-proposed-migration
 {%- elif stage_name == "staging" %}
-            net-name: net_stg_proposed-migration
+            net-name: net_stg-proposed-migration
 {%- elif stage_name == "devel" %}
             net-name: net_instances
             mirror: http://ports.ubuntu.com/ubuntu-ports/
@@ -164,7 +164,7 @@ applications:
 {%- if stage_name == "production" %}
             net-name: net_prod-proposed-migration
 {%- elif stage_name == "staging" %}
-            net-name: net_stg_proposed-migration
+            net-name: net_stg-proposed-migration
 {%- elif stage_name == "devel" %}
             net-name: net_instances
             mirror: http://ports.ubuntu.com/ubuntu-ports/