Merge magnum bundles into main bundles

When regression testing stable point releases, we typically test several projects with one of the main bundles. The stable releases now include magnum, so this should hopefully make testing SRUs in a single deployment possible, even though they will take longer to run. This also bumps the ceph-osd storage to 24G since magnum setup uploads image(s) and we were running out of storage.
openstack-charmers · Sep 22, 2023 · eb3cdf7 · eb3cdf7
1 parent f87c94e
commit eb3cdf7
Show file tree

Hide file tree

Showing 45 changed files with 677 additions and 3,987 deletions.
diff --git a/tests/distro-regression/tests/bundles/bionic-queens.yaml b/tests/distro-regression/tests/bundles/bionic-queens.yaml
@@ -35,7 +35,7 @@ applications:
     options:
       source: *source
     storage:
-      osd-devices: cinder,15G
+      osd-devices: cinder,24G
     constraints: mem=4096
     channel: luminous/edge
   cinder:

diff --git a/tests/distro-regression/tests/bundles/bionic-rocky.yaml b/tests/distro-regression/tests/bundles/bionic-rocky.yaml
@@ -43,7 +43,7 @@ applications:
     options:
       source: *source
     storage:
-      osd-devices: cinder,15G
+      osd-devices: cinder,24G
     constraints: mem=4096
     channel: mimic/edge
   cinder:

diff --git a/tests/distro-regression/tests/bundles/bionic-stein.yaml b/tests/distro-regression/tests/bundles/bionic-stein.yaml
@@ -43,7 +43,7 @@ applications:
     options:
       source: *source
     storage:
-      osd-devices: cinder,15G
+      osd-devices: cinder,24G
     constraints: mem=4096
     channel: octopus/edge
   cinder:

diff --git a/tests/distro-regression/tests/bundles/bionic-train.yaml b/tests/distro-regression/tests/bundles/bionic-train.yaml
@@ -43,7 +43,7 @@ applications:
     options:
       source: *source
     storage:
-      osd-devices: cinder,15G
+      osd-devices: cinder,24G
     constraints: mem=4096
     channel: nautilus/edge
   cinder:

diff --git a/tests/distro-regression/tests/bundles/bionic-ussuri.yaml b/tests/distro-regression/tests/bundles/bionic-ussuri.yaml
@@ -43,7 +43,7 @@ applications:
     options:
       source: *source
     storage:
-      osd-devices: cinder,15G
+      osd-devices: cinder,24G
     constraints: mem=4096
     channel: octopus/edge
   cinder:

diff --git a/tests/distro-regression/tests/bundles/focal-ussuri-base.yaml b/tests/distro-regression/tests/bundles/focal-ussuri-base.yaml
diff --git a/tests/distro-regression/tests/bundles/focal-ussuri-magnum.yaml b/tests/distro-regression/tests/bundles/focal-ussuri-magnum.yaml
diff --git a/tests/distro-regression/tests/bundles/focal-ussuri-ovn-22.03.yaml b/tests/distro-regression/tests/bundles/focal-ussuri-ovn-22.03.yaml
@@ -49,7 +49,7 @@ applications:
     options:
       source: *source
     storage:
-      osd-devices: cinder,15G
+      osd-devices: cinder,24G
     constraints: mem=4096
     channel: octopus/edge
   cinder: