From e99dcb08c782b29e0640621b57de73d1ad355edc Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Wed, 3 Jun 2026 16:08:09 +0000 Subject: [PATCH 1/3] ovn: Drop branches not moved to the monorepo. Signed-off-by: Frode Nordahl --- .../data/lp-builder-config/ovn.yaml | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/charmed_openstack_info/data/lp-builder-config/ovn.yaml b/charmed_openstack_info/data/lp-builder-config/ovn.yaml index 06656f4..6bab684 100644 --- a/charmed_openstack_info/data/lp-builder-config/ovn.yaml +++ b/charmed_openstack_info/data/lp-builder-config/ovn.yaml @@ -9,32 +9,6 @@ defaults: - latest/edge bases: - "24.04" - stable/20.03: - build-channels: - charmcraft: "1.5/stable" - channels: - #- openstack-ussuri/edge - #- openstack-victoria/edge - - 20.03/stable - bases: - - "18.04" - - "20.04" - stable/20.12: - build-channels: - charmcraft: "1.5/stable" - channels: - #- openstack-wallaby/edge - - 20.12/stable - bases: - - "20.04" - stable/21.09: - build-channels: - charmcraft: "1.5/stable" - channels: - #- openstack-xena/edge - - 21.09/stable - bases: - - "20.04" stable/22.03: build-channels: charmcraft: "2.x/stable" From 307fff51a557e5c3dd548c0ba2a6cc8976a1eb4e Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Fri, 5 Jun 2026 10:34:14 +0000 Subject: [PATCH 2/3] ovn: Move all branches to charmcraft 3.x/stable. Launchpad's integration with charm builds has changed so that it calls out to charmcraft to inform it about architectures and bases to schedule builds for. This does not work with charmcraft 2.x and 3.x is required. Signed-off-by: Frode Nordahl --- charmed_openstack_info/data/lp-builder-config/ovn.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charmed_openstack_info/data/lp-builder-config/ovn.yaml b/charmed_openstack_info/data/lp-builder-config/ovn.yaml index 6bab684..a0e03bc 100644 --- a/charmed_openstack_info/data/lp-builder-config/ovn.yaml +++ b/charmed_openstack_info/data/lp-builder-config/ovn.yaml @@ -11,7 +11,7 @@ defaults: - "24.04" stable/22.03: build-channels: - charmcraft: "2.x/stable" + charmcraft: "3.x/stable" channels: - 22.03/stable bases: @@ -19,7 +19,7 @@ defaults: - "22.04" stable/22.09: build-channels: - charmcraft: "2.x/stable" + charmcraft: "3.x/stable" channels: - 22.09/stable bases: @@ -27,7 +27,7 @@ defaults: - "22.10" stable/23.03: build-channels: - charmcraft: "2.x/stable" + charmcraft: "3.x/stable" channels: - 23.03/stable bases: @@ -36,7 +36,7 @@ defaults: stable/23.09: build-channels: # Needs to be candidate at the moment to pick up 2.5.0 - charmcraft: "2.x/stable" + charmcraft: "3.x/stable" channels: - 23.09/stable bases: @@ -45,7 +45,7 @@ defaults: stable/24.03: build-channels: # Needs to be candidate at the moment to pick up 2.5.0 - charmcraft: "2.x/stable" + charmcraft: "3.x/stable" channels: - 24.03/stable bases: From 8e2e31e37855cacf1c9a9b500997e843bf1ad96a Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Wed, 3 Jun 2026 16:14:57 +0000 Subject: [PATCH 3/3] ovn: Move to new monorepo update 24.03 bases. The diff is large due to the fact that build-path is a branch level configuration, and as a consequence we can no longer apply global defaults to the various projects. Signed-off-by: Frode Nordahl --- .../data/lp-builder-config/ovn.yaml | 224 +++++++++++++----- 1 file changed, 171 insertions(+), 53 deletions(-) diff --git a/charmed_openstack_info/data/lp-builder-config/ovn.yaml b/charmed_openstack_info/data/lp-builder-config/ovn.yaml index a0e03bc..e6e9e1c 100644 --- a/charmed_openstack_info/data/lp-builder-config/ovn.yaml +++ b/charmed_openstack_info/data/lp-builder-config/ovn.yaml @@ -1,69 +1,187 @@ # OVN Charms defaults: team: ubuntu-ovn-eng - branches: - main: - build-channels: - charmcraft: "3.x/stable" - channels: - - latest/edge - bases: - - "24.04" - stable/22.03: - build-channels: - charmcraft: "3.x/stable" - channels: - - 22.03/stable - bases: - - "20.04" - - "22.04" - stable/22.09: - build-channels: - charmcraft: "3.x/stable" - channels: - - 22.09/stable - bases: - - "22.04" - - "22.10" - stable/23.03: - build-channels: - charmcraft: "3.x/stable" - channels: - - 23.03/stable - bases: - - "22.04" - - "23.04" - stable/23.09: - build-channels: - # Needs to be candidate at the moment to pick up 2.5.0 - charmcraft: "3.x/stable" - channels: - - 23.09/stable - bases: - - "22.04" - - "23.10" - stable/24.03: - build-channels: - # Needs to be candidate at the moment to pick up 2.5.0 - charmcraft: "3.x/stable" - channels: - - 24.03/stable - bases: - - "22.04" - - "23.10" projects: - name: OVN Central charmhub: ovn-central launchpad: charm-ovn-central - repository: https://github.com/canonical/charm-ovn-central.git + repository: ~ubuntu-ovn-eng/ovn-charms-v1/+git/ovn-charms-v1 + branches: + main: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-central + channels: + - latest/edge + bases: + - "22.04" + - "24.04" + stable/22.03: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-central + channels: + - 22.03/edge + bases: + - "20.04" + - "22.04" + stable/22.09: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-central + channels: + - 22.09/edge + bases: + - "22.04" + - "22.10" + stable/23.03: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-central + channels: + - 23.03/edge + bases: + - "22.04" + - "23.04" + stable/23.09: + build-channels: + # Needs to be candidate at the moment to pick up 2.5.0 + charmcraft: "3.x/stable" + build-path: ovn-central + channels: + - 23.09/edge + bases: + - "22.04" + - "23.10" + stable/24.03: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-central + channels: + - 24.03/edge + bases: + - "22.04" + - "24.04" - name: OVN Dedicated Chassis charmhub: ovn-dedicated-chassis launchpad: charm-ovn-dedicated-chassis - repository: https://github.com/canonical/charm-ovn-dedicated-chassis.git + repository: ~ubuntu-ovn-eng/ovn-charms-v1/+git/ovn-charms-v1 + branches: + main: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-dedicated-chassis + channels: + - latest/edge + bases: + - "22.04" + - "24.04" + stable/22.03: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-dedicated-chassis + channels: + - 22.03/edge + bases: + - "20.04" + - "22.04" + stable/22.09: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-dedicated-chassis + channels: + - 22.09/edge + bases: + - "22.04" + - "22.10" + stable/23.03: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-dedicated-chassis + channels: + - 23.03/edge + bases: + - "22.04" + - "23.04" + stable/23.09: + build-channels: + # Needs to be candidate at the moment to pick up 2.5.0 + charmcraft: "3.x/stable" + build-path: ovn-dedicated-chassis + channels: + - 23.09/edge + bases: + - "22.04" + - "23.10" + stable/24.03: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-dedicated-chassis + channels: + - 24.03/edge + bases: + - "22.04" + - "24.04" - name: OVN Chassis charmhub: ovn-chassis launchpad: charm-ovn-chassis - repository: https://github.com/canonical/charm-ovn-chassis.git + repository: ~ubuntu-ovn-eng/ovn-charms-v1/+git/ovn-charms-v1 + branches: + main: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-chassis + channels: + - latest/edge + bases: + - "22.04" + - "24.04" + stable/22.03: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-chassis + channels: + - 22.03/edge + bases: + - "20.04" + - "22.04" + stable/22.09: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-chassis + channels: + - 22.09/edge + bases: + - "22.04" + - "22.10" + stable/23.03: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-chassis + channels: + - 23.03/edge + bases: + - "22.04" + - "23.04" + stable/23.09: + build-channels: + # Needs to be candidate at the moment to pick up 2.5.0 + charmcraft: "3.x/stable" + build-path: ovn-chassis + channels: + - 23.09/edge + bases: + - "22.04" + - "23.10" + stable/24.03: + build-channels: + charmcraft: "3.x/stable" + build-path: ovn-chassis + channels: + - 24.03/edge + bases: + - "22.04" + - "24.04"