From 19a004e0a500ea4839fa1e089e1c50c953cec3b3 Mon Sep 17 00:00:00 2001
From: Sven Kieske <kieske@osism.tech>
Date: Tue, 9 Apr 2024 14:11:54 +0200
Subject: [PATCH] CI/Master only: pin opensearch{-dashboards}

pin opensearch and opensearch-dashboards to 2.12. for now
Closes-Bug: #2060668
Related-Bug: #2060306

Change-Id: I3df4823d78474d94e138ff73f0f577bd247bdad0
Signed-off-by: Sven Kieske <kieske@osism.tech>
---
 docker/base/apt_preferences.debian                    | 7 +++++++
 docker/base/apt_preferences.ubuntu                    | 7 +++++++
 docker/opensearch/opensearch-dashboards/Dockerfile.j2 | 6 ++++++
 docker/opensearch/opensearch/Dockerfile.j2            | 5 +++++
 4 files changed, 25 insertions(+)

diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 99d2c9a4d4..9153d866e3 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -10,3 +10,10 @@ Pin-Priority: 1000
 Package: *
 Pin: release n=bookworm-backports
 Pin-Priority: -1000
+
+# NOTE (SvenKieske): pin until we have proper authentication
+# between haproxy and opensearch-dashboard in CI
+# see bug https://bugs.launchpad.net/kolla/+bug/2060668
+Package: opensearch*
+Pin: version 2.12.*
+Pin-Priority: 1000
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
index 64b589362e..d9f78c5bb6 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/docker/base/apt_preferences.ubuntu
@@ -9,3 +9,10 @@ Pin-Priority: 1000
 Package: *
 Pin: origin dlm.mariadb.com
 Pin-Priority: 1000
+
+# NOTE (SvenKieske): pin until we have proper authentication
+# between haproxy and opensearch-dashboard in CI
+# see bug https://bugs.launchpad.net/kolla/+bug/2060668
+Package: opensearch*
+Pin: version 2.12.*
+Pin-Priority: 1000
diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2
index 83677474a3..b76958f89d 100644
--- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2
+++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2
@@ -10,6 +10,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='opensearch-dashboards', shell='/bin/bash', homedir='/usr/share/opensearch-dashboards') }}
 {{ macros.enable_extra_repos(['opensearch-dashboards']) }}
 
+# (SvenKieske): Workaround for https://bugs.launchpad.net/kolla/+bug/2060668
+{% if base_package_type == 'rpm' %}
+RUN dnf -y install 'dnf-command(versionlock)' && \
+    dnf versionlock add  --raw 'opensearch-dashboards-0:2.12.*'
+{% endif %}
+
 {% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
 
 {{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }}
diff --git a/docker/opensearch/opensearch/Dockerfile.j2 b/docker/opensearch/opensearch/Dockerfile.j2
index 891c1f7e64..6d686d6c38 100644
--- a/docker/opensearch/opensearch/Dockerfile.j2
+++ b/docker/opensearch/opensearch/Dockerfile.j2
@@ -10,6 +10,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }}
 {{ macros.enable_extra_repos(['opensearch']) }}
 
+# (SvenKieske): Workaround for https://bugs.launchpad.net/kolla/+bug/2060668
+{% if base_package_type == 'rpm' %}
+RUN dnf -y install 'dnf-command(versionlock)' && \
+    dnf versionlock add --raw 'opensearch-0:2.12.*'
+{% endif %}
     {% set opensearch_packages = [
         'opensearch'
     ] %}