From 23bac715009ed3e21ee78fdb45b4ff844b50117b Mon Sep 17 00:00:00 2001 From: sylvainfaivre Date: Thu, 30 Nov 2023 17:41:23 +0100 Subject: [PATCH] fix: use new repositories hosted on novemberain.com domain --- pillar.example | 2 +- rabbitmq/parameters/os_family/Debian.yaml | 8 ++++---- rabbitmq/parameters/os_family/RedHat.yaml | 8 ++++---- test/integration/default/files/_mapdata/almalinux-8.yaml | 8 ++++---- test/integration/default/files/_mapdata/centos-7.yaml | 8 ++++---- test/integration/default/files/_mapdata/centos-8.yaml | 8 ++++---- test/integration/default/files/_mapdata/debian-10.yaml | 8 ++++---- test/integration/default/files/_mapdata/debian-11.yaml | 8 ++++---- test/integration/default/files/_mapdata/debian-9.yaml | 8 ++++---- test/integration/default/files/_mapdata/fedora-34.yaml | 8 ++++---- test/integration/default/files/_mapdata/fedora-35.yaml | 8 ++++---- test/integration/default/files/_mapdata/fedora-36.yaml | 8 ++++---- .../integration/default/files/_mapdata/oraclelinux-7.yaml | 8 ++++---- .../integration/default/files/_mapdata/oraclelinux-8.yaml | 8 ++++---- test/integration/default/files/_mapdata/rockylinux-8.yaml | 8 ++++---- test/integration/default/files/_mapdata/ubuntu-16.yaml | 8 ++++---- test/integration/default/files/_mapdata/ubuntu-18.yaml | 8 ++++---- test/integration/default/files/_mapdata/ubuntu-20.yaml | 8 ++++---- test/integration/default/files/_mapdata/ubuntu-22.yaml | 8 ++++---- .../integration/nopillars/files/_mapdata/almalinux-8.yaml | 8 ++++---- .../nopillars/files/_mapdata/amazonlinux-2.yaml | 8 ++++---- test/integration/nopillars/files/_mapdata/centos-7.yaml | 8 ++++---- test/integration/nopillars/files/_mapdata/centos-8.yaml | 8 ++++---- test/integration/nopillars/files/_mapdata/debian-10.yaml | 8 ++++---- test/integration/nopillars/files/_mapdata/debian-11.yaml | 8 ++++---- test/integration/nopillars/files/_mapdata/debian-9.yaml | 8 ++++---- .../nopillars/files/_mapdata/oraclelinux-7.yaml | 8 ++++---- .../nopillars/files/_mapdata/oraclelinux-8.yaml | 8 ++++---- .../nopillars/files/_mapdata/rockylinux-8.yaml | 8 ++++---- test/integration/nopillars/files/_mapdata/ubuntu-16.yaml | 8 ++++---- test/integration/nopillars/files/_mapdata/ubuntu-18.yaml | 8 ++++---- test/integration/nopillars/files/_mapdata/ubuntu-20.yaml | 8 ++++---- test/integration/nopillars/files/_mapdata/ubuntu-22.yaml | 8 ++++---- 33 files changed, 129 insertions(+), 129 deletions(-) diff --git a/pillar.example b/pillar.example index 78a8e7c4..e25f9529 100644 --- a/pillar.example +++ b/pillar.example @@ -250,7 +250,7 @@ rabbitmq: pkg: # https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.8.14 - use_upstream: repo # if available (i.e. packagecloud) + use_upstream: repo # if available (i.e. novemberain.com Cloudsmith mirror) environ: locale_all: en_US.UTF-8 values: {} diff --git a/rabbitmq/parameters/os_family/Debian.yaml b/rabbitmq/parameters/os_family/Debian.yaml index 11bd9fda..f5a397eb 100644 --- a/rabbitmq/parameters/os_family/Debian.yaml +++ b/rabbitmq/parameters/os_family/Debian.yaml @@ -19,10 +19,10 @@ values: repo: erlang: # yamllint disable-line rule:line-length - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: # yamllint disable-line rule:line-length - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb ... diff --git a/rabbitmq/parameters/os_family/RedHat.yaml b/rabbitmq/parameters/os_family/RedHat.yaml index 042f22da..f6572bfe 100644 --- a/rabbitmq/parameters/os_family/RedHat.yaml +++ b/rabbitmq/parameters/os_family/RedHat.yaml @@ -19,10 +19,10 @@ values: - socat repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el + baseurl: https://yum1.novemberain.com/erlang/el # yamllint disable-line rule:line-length - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key ... diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml index 5ff12de5..acd68fb9 100644 --- a/test/integration/default/files/_mapdata/almalinux-8.yaml +++ b/test/integration/default/files/_mapdata/almalinux-8.yaml @@ -264,11 +264,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index 5a0f668c..85e630e9 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -267,11 +267,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 0372cb58..2667401e 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -267,11 +267,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index bbdbfd24..ec439d41 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -266,11 +266,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index a95d0f25..5039e24d 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -264,11 +264,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 9b07d80d..4287ea2f 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -265,11 +265,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index 65be2d1b..ee98f2ad 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -267,11 +267,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml index 134a3044..bac59383 100644 --- a/test/integration/default/files/_mapdata/fedora-35.yaml +++ b/test/integration/default/files/_mapdata/fedora-35.yaml @@ -267,11 +267,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml index 0d6d51ac..6584de80 100644 --- a/test/integration/default/files/_mapdata/fedora-36.yaml +++ b/test/integration/default/files/_mapdata/fedora-36.yaml @@ -267,11 +267,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index 5ff12de5..acd68fb9 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -264,11 +264,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index 5ff12de5..acd68fb9 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -264,11 +264,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml index 5ff12de5..acd68fb9 100644 --- a/test/integration/default/files/_mapdata/rockylinux-8.yaml +++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml @@ -264,11 +264,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index 1de09b56..575458a5 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -265,11 +265,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 5180d623..1a2054ad 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -266,11 +266,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index 0a2b4607..2d4ad7f7 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -266,11 +266,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/ubuntu-22.yaml b/test/integration/default/files/_mapdata/ubuntu-22.yaml index 441dddaf..da2cc7ec 100644 --- a/test/integration/default/files/_mapdata/ubuntu-22.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-22.yaml @@ -50,11 +50,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/almalinux-8.yaml b/test/integration/nopillars/files/_mapdata/almalinux-8.yaml index 78afaf0d..0ebe657f 100644 --- a/test/integration/nopillars/files/_mapdata/almalinux-8.yaml +++ b/test/integration/nopillars/files/_mapdata/almalinux-8.yaml @@ -51,11 +51,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/amazonlinux-2.yaml b/test/integration/nopillars/files/_mapdata/amazonlinux-2.yaml index b054086e..d76ea33d 100644 --- a/test/integration/nopillars/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/nopillars/files/_mapdata/amazonlinux-2.yaml @@ -53,11 +53,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/centos-7.yaml b/test/integration/nopillars/files/_mapdata/centos-7.yaml index 78afaf0d..0ebe657f 100644 --- a/test/integration/nopillars/files/_mapdata/centos-7.yaml +++ b/test/integration/nopillars/files/_mapdata/centos-7.yaml @@ -51,11 +51,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/centos-8.yaml b/test/integration/nopillars/files/_mapdata/centos-8.yaml index 78afaf0d..0ebe657f 100644 --- a/test/integration/nopillars/files/_mapdata/centos-8.yaml +++ b/test/integration/nopillars/files/_mapdata/centos-8.yaml @@ -51,11 +51,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/debian-10.yaml b/test/integration/nopillars/files/_mapdata/debian-10.yaml index 441dddaf..da2cc7ec 100644 --- a/test/integration/nopillars/files/_mapdata/debian-10.yaml +++ b/test/integration/nopillars/files/_mapdata/debian-10.yaml @@ -50,11 +50,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/debian-11.yaml b/test/integration/nopillars/files/_mapdata/debian-11.yaml index 441dddaf..da2cc7ec 100644 --- a/test/integration/nopillars/files/_mapdata/debian-11.yaml +++ b/test/integration/nopillars/files/_mapdata/debian-11.yaml @@ -50,11 +50,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/debian-9.yaml b/test/integration/nopillars/files/_mapdata/debian-9.yaml index c50e8438..3e5bf0d9 100644 --- a/test/integration/nopillars/files/_mapdata/debian-9.yaml +++ b/test/integration/nopillars/files/_mapdata/debian-9.yaml @@ -53,11 +53,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/oraclelinux-7.yaml b/test/integration/nopillars/files/_mapdata/oraclelinux-7.yaml index 78afaf0d..0ebe657f 100644 --- a/test/integration/nopillars/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/nopillars/files/_mapdata/oraclelinux-7.yaml @@ -51,11 +51,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/oraclelinux-8.yaml b/test/integration/nopillars/files/_mapdata/oraclelinux-8.yaml index 78afaf0d..0ebe657f 100644 --- a/test/integration/nopillars/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/nopillars/files/_mapdata/oraclelinux-8.yaml @@ -51,11 +51,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/rockylinux-8.yaml b/test/integration/nopillars/files/_mapdata/rockylinux-8.yaml index 78afaf0d..0ebe657f 100644 --- a/test/integration/nopillars/files/_mapdata/rockylinux-8.yaml +++ b/test/integration/nopillars/files/_mapdata/rockylinux-8.yaml @@ -51,11 +51,11 @@ values: remove_os_erlang: true repo: erlang: - baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el - gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key + baseurl: https://yum1.novemberain.com/erlang/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key rabbitmq: - baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el - gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey + baseurl: https://yum1.novemberain.com/rabbitmq/el + gpgkey: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/ubuntu-16.yaml b/test/integration/nopillars/files/_mapdata/ubuntu-16.yaml index c50e8438..3e5bf0d9 100644 --- a/test/integration/nopillars/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/nopillars/files/_mapdata/ubuntu-16.yaml @@ -53,11 +53,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/ubuntu-18.yaml b/test/integration/nopillars/files/_mapdata/ubuntu-18.yaml index 441dddaf..da2cc7ec 100644 --- a/test/integration/nopillars/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/nopillars/files/_mapdata/ubuntu-18.yaml @@ -50,11 +50,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/ubuntu-20.yaml b/test/integration/nopillars/files/_mapdata/ubuntu-20.yaml index 441dddaf..da2cc7ec 100644 --- a/test/integration/nopillars/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/nopillars/files/_mapdata/ubuntu-20.yaml @@ -50,11 +50,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0 diff --git a/test/integration/nopillars/files/_mapdata/ubuntu-22.yaml b/test/integration/nopillars/files/_mapdata/ubuntu-22.yaml index 441dddaf..da2cc7ec 100644 --- a/test/integration/nopillars/files/_mapdata/ubuntu-22.yaml +++ b/test/integration/nopillars/files/_mapdata/ubuntu-22.yaml @@ -50,11 +50,11 @@ values: remove_os_erlang: true repo: erlang: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb rabbitmq: - key_url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - url: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb + key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key + url: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb use_upstream: repo retry_option: attempts: 0