canonical-ubuntu-qa team mailing list archive

[Skia <mp+457634@xxxxxxxxxxxxxxxxxx>]

Skia has proposed merging ~hyask/autopkgtest-cloud:skia/update_flavors 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/457634
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~hyask/autopkgtest-cloud:skia/update_flavors into autopkgtest-cloud:master.

diff --git a/mojo/service-bundle b/mojo/service-bundle
index 2f7485b..96f9bc8 100644
--- a/mojo/service-bundle
+++ b/mojo/service-bundle
@@ -77,19 +77,24 @@ applications:
             worker-setup-command2: /CHECKOUTDIR//setup-commands/setup-testbed
 {%- if stage_name == "production" %}
             net-name: net_prod-proposed-migration
+            worker-default-flavor: autopkgtest  # XXX TODO: I don't have access to prod, I don't know the config here
+            worker-big-flavor: autopkgtest-big
 {%- elif stage_name == "staging" %}
             net-name: net_stg-proposed-migration
+            worker-default-flavor: stag-cpu2-ram4-disk20
+            worker-big-flavor: stag-cpu4-ram16-disk50
 {%- elif stage_name == "devel" %}
             net-name: net_instances
-            mirror: http://ports.ubuntu.com/ubuntu-ports/
-            worker-args: ssh -s /CHECKOUTDIR//ssh-setup/nova -- --flavor $PACKAGESIZE --security-groups $SECGROUP --name adt-$RELEASE-$ARCHITECTURE-$PACKAGENAME-$TIMESTAMP-$HOSTNAME --image adt/ubuntu-$RELEASE-$ARCHITECTURE-server-.* --keyname testbed-/HOSTNAME/ --mirror=/MIRROR/
+            worker-default-flavor: cpu2-ram4-disk20
+            worker-big-flavor: cpu4-ram16-disk50
 {%- endif %}
 {%- if stage_name == "production" or stage_name == "staging" %}
             mirror: http://ftpmaster.internal/ubuntu/
-            worker-default-flavor: autopkgtest
-            worker-big-flavor: autopkgtest-big
             worker-args: ssh -s /CHECKOUTDIR//ssh-setup/nova -- --flavor $PACKAGESIZE --security-groups $SECGROUP --name adt-$RELEASE-$ARCHITECTURE-$PACKAGENAME-$TIMESTAMP-$HOSTNAME --image adt/ubuntu-$RELEASE-$HOSTARCH-server --keyname testbed-/HOSTNAME/ --net-id=/NET_NAME/ -e TERM=linux -e 'http_proxy={{ http_proxy }}' -e 'https_proxy={{ https_proxy }}' -e 'no_proxy={{ no_proxy }}' --mirror=/MIRROR/
             worker-setup-command: /AUTOPKGTEST_CLOUD_DIR//worker-config-production/setup-canonical.sh
+{% else %}
+            mirror: http://ports.ubuntu.com/ubuntu-ports/
+            worker-args: ssh -s /CHECKOUTDIR//ssh-setup/nova -- --flavor $PACKAGESIZE --security-groups $SECGROUP --name adt-$RELEASE-$ARCHITECTURE-$PACKAGENAME-$TIMESTAMP-$HOSTNAME --image adt/ubuntu-$RELEASE-$ARCHITECTURE-server-.* --keyname testbed-/HOSTNAME/ --mirror=/MIRROR/
 {% endif %}
 {%- if stage_name == "production" %}
             n-workers: |-