Skip to content

Commit 340350a

Browse files
committed
Revert "CI/Master only: pin opensearch{-dashboards}"
This reverts commit 19a004e. Reason for revert: Fixed Change-Id: I5491adef46fe0cec013a597cb05018d8d7e862f0
1 parent 7c098bd commit 340350a

File tree

4 files changed

+0
-25
lines changed

4 files changed

+0
-25
lines changed

docker/base/apt_preferences.debian

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,3 @@ Pin-Priority: 1000
1010
Package: *
1111
Pin: release n=bookworm-backports
1212
Pin-Priority: -1000
13-
14-
# NOTE (SvenKieske): pin until we have proper authentication
15-
# between haproxy and opensearch-dashboard in CI
16-
# see bug https://bugs.launchpad.net/kolla/+bug/2060668
17-
Package: opensearch*
18-
Pin: version 2.12.*
19-
Pin-Priority: 1000

docker/base/apt_preferences.ubuntu

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,3 @@ Pin-Priority: 1000
99
Package: *
1010
Pin: origin dlm.mariadb.com
1111
Pin-Priority: 1000
12-
13-
# NOTE (SvenKieske): pin until we have proper authentication
14-
# between haproxy and opensearch-dashboard in CI
15-
# see bug https://bugs.launchpad.net/kolla/+bug/2060668
16-
Package: opensearch*
17-
Pin: version 2.12.*
18-
Pin-Priority: 1000

docker/opensearch/opensearch-dashboards/Dockerfile.j2

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1010
{{ macros.configure_user(name='opensearch-dashboards', shell='/bin/bash', homedir='/usr/share/opensearch-dashboards') }}
1111
{{ macros.enable_extra_repos(['opensearch-dashboards']) }}
1212

13-
# (SvenKieske): Workaround for https://bugs.launchpad.net/kolla/+bug/2060668
14-
{% if base_package_type == 'rpm' %}
15-
RUN dnf -y install 'dnf-command(versionlock)' && \
16-
dnf versionlock add --raw 'opensearch-dashboards-0:2.12.*'
17-
{% endif %}
18-
1913
{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
2014

2115
{{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }}

docker/opensearch/opensearch/Dockerfile.j2

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1010
{{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }}
1111
{{ macros.enable_extra_repos(['opensearch']) }}
1212

13-
# (SvenKieske): Workaround for https://bugs.launchpad.net/kolla/+bug/2060668
14-
{% if base_package_type == 'rpm' %}
15-
RUN dnf -y install 'dnf-command(versionlock)' && \
16-
dnf versionlock add --raw 'opensearch-0:2.12.*'
17-
{% endif %}
1813
{% set opensearch_packages = [
1914
'opensearch'
2015
] %}

0 commit comments

Comments
 (0)