Merge autopkgtest-cloud:staging-net-name into autopkgtest-cloud:master

Proposed by Brian Murray
Status: Merged
Merged at revision: 0d6118fb191e19ed3b6fe17ad813c28858280b45
Proposed branch: autopkgtest-cloud:staging-net-name
Merge into: autopkgtest-cloud:master
Diff against target: 22 lines (+2/-2)
1 file modified
mojo/service-bundle (+2/-2)
Reviewer Review Type Date Requested Status
Paride Legovini Approve
Review via email: mp+444313@code.launchpad.net

Description of the change

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.)

To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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:
72{%- if stage_name == "production" %}72{%- if stage_name == "production" %}
73 net-name: net_prod-proposed-migration73 net-name: net_prod-proposed-migration
74{%- elif stage_name == "staging" %}74{%- elif stage_name == "staging" %}
75 net-name: net_stg_proposed-migration75 net-name: net_stg-proposed-migration
76{%- elif stage_name == "devel" %}76{%- elif stage_name == "devel" %}
77 net-name: net_instances77 net-name: net_instances
78 mirror: http://ports.ubuntu.com/ubuntu-ports/78 mirror: http://ports.ubuntu.com/ubuntu-ports/
@@ -164,7 +164,7 @@ applications:
164{%- if stage_name == "production" %}164{%- if stage_name == "production" %}
165 net-name: net_prod-proposed-migration165 net-name: net_prod-proposed-migration
166{%- elif stage_name == "staging" %}166{%- elif stage_name == "staging" %}
167 net-name: net_stg_proposed-migration167 net-name: net_stg-proposed-migration
168{%- elif stage_name == "devel" %}168{%- elif stage_name == "devel" %}
169 net-name: net_instances169 net-name: net_instances
170 mirror: http://ports.ubuntu.com/ubuntu-ports/170 mirror: http://ports.ubuntu.com/ubuntu-ports/

Subscribers

People subscribed via source and target branches