Ensure openvswitch-base children get ovs repo

Previously, openvswitch-base would enable the openvswitch repo, and
child containers (e.g. ovn-base, ovn-controller, etc) would be built
using ovn packages from that repo. Recently [1] builds were changed to
clean up repos at the end of the build, so now dependent containers must
re-enable the repo manually.

Also added an openvswitch repo override to tests to avoid regresssion.

[1] Ie5b9970a4575b6258dc238059d3f33ddfe155789
Closes-Bug: #2163314
Change-Id: I4ea1cc812167142743e3ebcbd532281bfe8a9799
Signed-off-by: Alex Welsh <alex@stackhpc.com>

7 files changed, 26 insertions, 0 deletions

diff --git a/kolla/docker/ovn/ovn-base/Dockerfile.j2 b/kolla/docker/ovn/ovn-base/Dockerfile.j2
index 9ab9f0aa6..96893782a 100644
--- a/kolla/docker/ovn/ovn-base/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-base/Dockerfile.j2
@@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 {{ macros.kolla_enable_base_repos() }}
 
 {% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['openvswitch']) }}
+
     {% set ovn_base_packages = [
         'ovn${KOLLA_RPM_OVN_VERSION}',
     ] %}
diff --git a/kolla/docker/ovn/ovn-controller/Dockerfile.j2 b/kolla/docker/ovn/ovn-controller/Dockerfile.j2
index a04562107..b70db50e6 100644
--- a/kolla/docker/ovn/ovn-controller/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-controller/Dockerfile.j2
@@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 {{ macros.kolla_enable_base_repos() }}
 
 {% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['openvswitch']) }}
+
     {% set ovn_controller_packages = [
         'ovn${KOLLA_RPM_OVN_VERSION}-host'
     ] %}
diff --git a/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2 b/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2
index 932d7a5d7..472c6e8c9 100644
--- a/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-nb-db-server/Dockerfile.j2
@@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 {{ macros.kolla_enable_base_repos() }}
 
 {% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['openvswitch']) }}
+
     {% set ovn_nb_db_server_packages = [
         'ovn${KOLLA_RPM_OVN_VERSION}-central',
     ] %}
diff --git a/kolla/docker/ovn/ovn-northd/Dockerfile.j2 b/kolla/docker/ovn/ovn-northd/Dockerfile.j2
index 227584ed4..6a9c1b03f 100644
--- a/kolla/docker/ovn/ovn-northd/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-northd/Dockerfile.j2
@@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 {{ macros.kolla_enable_base_repos() }}
 
 {% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['openvswitch']) }}
+
     {% set ovn_northd_packages = [
         'ovn${KOLLA_RPM_OVN_VERSION}-central',
     ] %}
diff --git a/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2 b/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2
index fbef63713..419622389 100644
--- a/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2
+++ b/kolla/docker/ovn/ovn-sb-db-server/Dockerfile.j2
@@ -10,6 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 {{ macros.kolla_enable_base_repos() }}
 
 {% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['openvswitch']) }}
+
     {% set ovn_sb_db_server_packages = [
         'ovn${KOLLA_RPM_OVN_VERSION}-central',
     ] %}
diff --git a/releasenotes/notes/bug-2163314-d99dd8d0f7a76a95.yaml b/releasenotes/notes/bug-2163314-d99dd8d0f7a76a95.yaml
new file mode 100644
index 000000000..0683c8ced
--- /dev/null
+++ b/releasenotes/notes/bug-2163314-d99dd8d0f7a76a95.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes child image builds from ``openvswitch-base`` with a custom
+    OpenvSwitch repo.
+    `LP#2163314 <https://launchpad.net/bugs/2163314>`__
diff --git a/tests/templates/repos.yaml.j2 b/tests/templates/repos.yaml.j2
index 9129f74eb..573173d95 100644
--- a/tests/templates/repos.yaml.j2
+++ b/tests/templates/repos.yaml.j2
@@ -32,6 +32,11 @@ rocky:
     build_only: true
     gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-10"
     name: "crb"
+  openvswitch:
+    baseurl: "http://centos-stream.mirrorservice.org/SIGs/$releasever-stream/nfv/$basearch/openvswitch-2/"
+    build_only: true
+    gpgkey: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-NFV"
+    name: "centos-nfv-openvswitch"
 {% elif base_distro == 'ubuntu' %}
 ubuntu:
   ubuntu: