From 953ceccb0b374f15e055abc4830d5de2e9a2c2aa Mon Sep 17 00:00:00 2001 From: Damian Dabrowski Date: Tue, 4 Jul 2023 12:58:33 +0200 Subject: [PATCH] Use wildcards to specify rabbit/erlang versions For a long time we were struggling with disappearing packages on packagecloud/cloudsmith repos. We were told to use {ppa1,yum1}.novemberain.com because packages should not disappear from there[1]. Unfortunately it just happened causing Rocky jobs to fail with error message: "No package erlang-25.3.2-1.el9.x86_64 available." Because we had this issue for a long time and we have not found any proper solution so far, I think the best we can do is to use wildcards for version definitions. Wildcards are used only for build numbers(number after 3th dot) if they are present. It should minimize a chance to install incompatible erlang and rabbitmq versions. [1] https://github.com/rabbitmq/rabbitmq-server/discussions/8386#discussioncomment-6022021 Required-By: https://review.opendev.org/c/openstack/openstack-ansible-os_rally/+/887528 Change-Id: I99683a031f935b579d38ae457c484c9a150344c6 --- vars/debian.yml | 4 ++-- vars/redhat.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/debian.yml b/vars/debian.yml index b0e137aa..b670f00a 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -14,7 +14,7 @@ # limitations under the License. _rabbitmq_install_method: external_repo -_rabbitmq_package_version: "3.11.17-1" +_rabbitmq_package_version: "3.11.17*" _rabbitmq_gpg_keys: - file: gpg/C072C960 @@ -35,7 +35,7 @@ _rabbitmq_erlang_repo: state: "present" filename: els_erlang -_rabbitmq_erlang_version_spec: "{{ (rabbitmq_install_method == 'external_repo') | ternary('1:25.3.2.1-1', '1:22.*') }}" +_rabbitmq_erlang_version_spec: "{{ (rabbitmq_install_method == 'external_repo') | ternary('1:25.3.2*', '1:22.*') }}" rabbitmq_dependencies: - erlang-base diff --git a/vars/redhat.yml b/vars/redhat.yml index 5f2a2211..e578b9b7 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -14,12 +14,12 @@ # limitations under the License. _rabbitmq_install_method: external_repo -_rabbitmq_package_version: 3.11.17-1 +_rabbitmq_package_version: "3.11.17*" # NOTE(nhanlon) 2023-05-30: although the package repository is marked # el9, the packages themselves still have an el8 dist tag for rabbitmq _rabbitmq_package_dist_tag: "el8" -_erlang_package_version: 25.3.2-1 +_erlang_package_version: "25.3.2*" _erlang_package_dist_tag: "el{{ ansible_facts['distribution_major_version'] }}" # NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/