From 707f3c0af0759bc9b2c676399532e3636fffd28f Mon Sep 17 00:00:00 2001 From: Billy Olsen Date: Wed, 7 Feb 2024 18:20:54 -0700 Subject: [PATCH] Update bundles to specify source config option The ceph-mon and ceph-osd charms changed the default source config option to be bobcat in the master branches. This breaks focal tests as the focal-bobcat cloud archive is not a valid source repository. Update the config options for the test bundles to be explicit in the source of package updates. Change-Id: Ia535b0500d39409f939f0aa58271866efbcd55fb --- tests/bundles/focal-ec.yaml | 6 ++++++ tests/bundles/focal.yaml | 6 ++++++ tests/bundles/jammy-ec.yaml | 6 ++++++ tests/bundles/jammy-reef-ec.yaml | 1 + tests/bundles/jammy-reef.yaml | 1 + tests/bundles/jammy.yaml | 6 ++++++ tests/bundles/lunar-ec.yaml | 6 ++++++ tests/bundles/lunar.yaml | 6 ++++++ 8 files changed, 38 insertions(+) diff --git a/tests/bundles/focal-ec.yaml b/tests/bundles/focal-ec.yaml index 8b017fb..f27597f 100644 --- a/tests/bundles/focal-ec.yaml +++ b/tests/bundles/focal-ec.yaml @@ -1,3 +1,6 @@ +variables: + source: &source cloud:focal-yoga + local_overlay_enabled: False series: focal machines: @@ -36,6 +39,7 @@ applications: pool-type: erasure-coded ec-profile-k: 4 ec-profile-m: 2 + source: *source to: - '0' - '1' @@ -46,6 +50,7 @@ applications: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' + source: *source to: - '0' - '1' @@ -59,6 +64,7 @@ applications: num_units: 3 options: monitor-count: '3' + source: *source to: - '3' - '4' diff --git a/tests/bundles/focal.yaml b/tests/bundles/focal.yaml index 5293c2a..951cfaa 100644 --- a/tests/bundles/focal.yaml +++ b/tests/bundles/focal.yaml @@ -1,3 +1,6 @@ +variables: + source: &source cloud:focal-yoga + local_overlay_enabled: False series: focal machines: @@ -33,6 +36,7 @@ applications: num_units: 2 options: gateway-metadata-pool: iscsi-foo-metadata + source: *source to: - '0' - '1' @@ -43,6 +47,7 @@ applications: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' + source: *source to: - '0' - '1' @@ -56,6 +61,7 @@ applications: num_units: 3 options: monitor-count: '3' + source: *source to: - '3' - '4' diff --git a/tests/bundles/jammy-ec.yaml b/tests/bundles/jammy-ec.yaml index 0bbabc2..9de7d4f 100644 --- a/tests/bundles/jammy-ec.yaml +++ b/tests/bundles/jammy-ec.yaml @@ -1,3 +1,6 @@ +variables: + source: &source distro + local_overlay_enabled: False series: jammy machines: @@ -36,6 +39,7 @@ applications: pool-type: erasure-coded ec-profile-k: 4 ec-profile-m: 2 + source: *source to: - '0' - '1' @@ -46,6 +50,7 @@ applications: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' + source: *source to: - '0' - '1' @@ -59,6 +64,7 @@ applications: num_units: 3 options: monitor-count: '3' + source: *source to: - '3' - '4' diff --git a/tests/bundles/jammy-reef-ec.yaml b/tests/bundles/jammy-reef-ec.yaml index 45b749c..646f850 100644 --- a/tests/bundles/jammy-reef-ec.yaml +++ b/tests/bundles/jammy-reef-ec.yaml @@ -39,6 +39,7 @@ applications: pool-type: erasure-coded ec-profile-k: 4 ec-profile-m: 2 + source: *source to: - '0' - '1' diff --git a/tests/bundles/jammy-reef.yaml b/tests/bundles/jammy-reef.yaml index 93fc7fe..70d043d 100644 --- a/tests/bundles/jammy-reef.yaml +++ b/tests/bundles/jammy-reef.yaml @@ -38,6 +38,7 @@ applications: num_units: 4 options: gateway-metadata-pool: iscsi-foo-metadata + source: *source to: - '0' - '1' diff --git a/tests/bundles/jammy.yaml b/tests/bundles/jammy.yaml index 6a57b0f..4c26c99 100644 --- a/tests/bundles/jammy.yaml +++ b/tests/bundles/jammy.yaml @@ -1,3 +1,6 @@ +variables: + source: &source distro + local_overlay_enabled: False series: jammy machines: @@ -35,6 +38,7 @@ applications: num_units: 4 options: gateway-metadata-pool: iscsi-foo-metadata + source: *source to: - '0' - '1' @@ -47,6 +51,7 @@ applications: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' + source: *source to: - '0' - '1' @@ -60,6 +65,7 @@ applications: num_units: 3 options: monitor-count: '3' + source: *source to: - '3' - '4' diff --git a/tests/bundles/lunar-ec.yaml b/tests/bundles/lunar-ec.yaml index b9c9771..d451983 100644 --- a/tests/bundles/lunar-ec.yaml +++ b/tests/bundles/lunar-ec.yaml @@ -1,3 +1,6 @@ +variables: + source: &source distro + local_overlay_enabled: False series: lunar machines: @@ -36,6 +39,7 @@ applications: pool-type: erasure-coded ec-profile-k: 4 ec-profile-m: 2 + source: *source to: - '0' - '1' @@ -46,6 +50,7 @@ applications: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' + source: *source to: - '0' - '1' @@ -59,6 +64,7 @@ applications: num_units: 3 options: monitor-count: '3' + source: *source to: - '3' - '4' diff --git a/tests/bundles/lunar.yaml b/tests/bundles/lunar.yaml index f9123b3..041f75f 100644 --- a/tests/bundles/lunar.yaml +++ b/tests/bundles/lunar.yaml @@ -1,3 +1,6 @@ +variables: + source: &source distro + local_overlay_enabled: False series: lunar machines: @@ -35,6 +38,7 @@ applications: num_units: 4 options: gateway-metadata-pool: iscsi-foo-metadata + source: *source to: - '0' - '1' @@ -47,6 +51,7 @@ applications: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' + source: *source to: - '0' - '1' @@ -60,6 +65,7 @@ applications: num_units: 3 options: monitor-count: '3' + source: *source to: - '3' - '4'