Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rabbitmq builds after move to Cloudsmith mirror #1301

Merged
merged 4 commits into from
Sep 26, 2024
Merged

Fix rabbitmq builds after move to Cloudsmith mirror #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f51667
Add sed for multiline baseurl in yum repos
bbezak Sep 17, 2024
3960126
use new Rabbitmq Cloudsmith repos
bbezak Sep 25, 2024
3dd00cf
use rabbitmq built from Cloudsmith repo
bbezak Sep 25, 2024
1329ac2
Merge branch 'stackhpc/2023.1' into 2023.1-fix-rabbit-two-repos
bbezak Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/kayobe/kolla-image-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ kolla_image_tags:
ovn:
rocky-9: 2023.1-rocky-9-20240809T102431
rabbitmq:
rocky-9: 2023.1-rocky-9-20240823T101942
rocky-9: 2023.1-rocky-9-20240925T133913
bbezak marked this conversation as resolved.
Show resolved Hide resolved
ubuntu-jammy: 2023.1-ubuntu-jammy-20240823T101942
1 change: 1 addition & 0 deletions etc/kayobe/kolla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ kolla_build_blocks:
{% for repo in base_centos_repo_overrides_post_yum_list %}
sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[ \t]*\(https.*\)/#\1/g' \
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
-e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
{% endfor %}
Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/pulp-repo-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ stackhpc_pulp_repo_epel_9_version: 20240708T235303
stackhpc_pulp_repo_grafana_version: 20240708T235303
stackhpc_pulp_repo_opensearch_2_x_version: 20240626T000533
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240626T000533
stackhpc_pulp_repo_rabbitmq_erlang_version: 20240506T000343
stackhpc_pulp_repo_rabbitmq_server_version: 20240704T001154
stackhpc_pulp_repo_rabbitmq_erlang_version: 20240925T093206
stackhpc_pulp_repo_rabbitmq_server_version: 20240925T111913
stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233
stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240517T012522
stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511
Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/stackhpc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/
stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"

# RabbitMQ - Erlang for Redhat family, version 8/9 agnostic
stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"
stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"
stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"

# RabbitMQ for Redhat family, version 8/9 agnostic
stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_repo_rabbitmq_server_version }}"
stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rabbitmq_server_version }}"
stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"

# CentOS Stream 9 - NFV OpenvSwitch
Expand Down
7 changes: 7 additions & 0 deletions releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
upgrade:
- |
RabbitMQ and Erlang packages are now all installed from the Cloudsmith
``rabbitmq.com`` mirrors since the RabbitMQ ``packagecloud.io`` is getting
shut down August 18st, 2024:
https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024
Loading