Merge autopkgtest-cloud:nonceph-workers into autopkgtest-cloud:master

[Brian Murray]

9cd6dc3... by Brian Murray on 2023-02-27

Add staging and devel n-workers for lrg units

[Paride Legovini (paride)]

I verified that:

 - The n-workers set to 0 apply to the old autopkgtest-cloud-worker units (those with the now broken ceph storage);
 - The bigger autopkgtest-cloud-worker-lrg without ceph storage are configured as the old ones, with non-zero n-workers.

LGTM

review: Approve

ddc5877... by Brian Murray on 2023-02-27

Fix typo

[Brian Murray (brian-murray)]

I merged this with a squash.

diff --git a/mojo/service-bundle b/mojo/service-bundle
index 004d6e1..dab0f02 100644
--- a/mojo/service-bundle
+++ b/mojo/service-bundle
@@ -122,7 +122,11 @@ applications:
 {%- else %}
         num_units: 1
 {%- endif %}
+<<<<<<< mojo/service-bundle
         constraints: mem=32G cores=8 root-disk=100G
+=======
+        constraints: mem=8G cores=4 root-disk=200G
+>>>>>>> mojo/service-bundle
         options: &common-options-2
             swift-password: include-file://{{local_dir}}/swift_password
             releases: {{ releases }}