From 340350a387cbbe417eff9385156d665c3edd683d Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 16 Apr 2024 18:33:43 +0000 Subject: [PATCH] Revert "CI/Master only: pin opensearch{-dashboards}" This reverts commit 19a004e0a500ea4839fa1e089e1c50c953cec3b3. Reason for revert: Fixed Change-Id: I5491adef46fe0cec013a597cb05018d8d7e862f0 --- 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 deletions(-) diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 9153d866e3..99d2c9a4d4 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -10,10 +10,3 @@ 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 d9f78c5bb6..64b589362e 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -9,10 +9,3 @@ 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 09cbdd3b9c..a4bbd29f44 100644 --- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 +++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 @@ -10,12 +10,6 @@ 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 ba90eb228b..196cf675bf 100644 --- a/docker/opensearch/opensearch/Dockerfile.j2 +++ b/docker/opensearch/opensearch/Dockerfile.j2 @@ -10,11 +10,6 @@ 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' ] %}