Fix rabbitmq image build

This patch is replacing ppa.launchpadcontent.net
by ppa1.novemberain.com.

Reason for replacement is that only latest erlang version
is available on the current ppa source.

Setting Debian ARM jobs non voting for now, since the new ppa
does not contain arm64 packages.

This repo is based on the official Erlang/OTP package
for Debian. The RabbitMQ team adapted the upstream package
to produce packages for more/different combinations of
Erlang/OTP, Debian and Ubuntu releases.

Change-Id: Iddec6ec555f98e13c2f199e5ca7dad7f4819b1a8
(cherry picked from commit 4950c03e59)
This commit is contained in:
Michal Arbet 2023-06-14 12:14:02 +02:00 committed by Maksim Malchuk
parent 2ca7ec1613
commit 8dc32be6f1
3 changed files with 8 additions and 6 deletions

View File

@ -8,7 +8,8 @@
check-arm64:
jobs:
- kolla-build-debian-aarch64
- kolla-ansible-debian-aarch64
- kolla-ansible-debian-aarch64:
voting: false
gate:
jobs:
- kolla-build-debian
@ -40,6 +41,7 @@
name: kolla-build-debian-aarch64
parent: kolla-build-debian
nodeset: kolla-debian-bullseye-aarch64
voting: false
- job:
name: kolla-publish-debian-dockerhub

View File

@ -283,7 +283,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
] %}
{% set base_apt_keys = [
{'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'},
{'name': 'erlang-ppa', 'keyid': 'E495BB49CC4BBE5B'},
{'name': 'rabbitmq', 'keyid': '9F4587F226208342'},
{'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
] %}

View File

@ -37,7 +37,7 @@ centos-aarch64:
debian:
erlang:
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu"
suite: "focal"
component: "main"
gpg_key: "erlang-ppa.gpg"
@ -84,7 +84,7 @@ debian:
debian-aarch64:
erlang:
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu"
suite: "focal"
component: "main"
gpg_key: "erlang-ppa.gpg"
@ -167,7 +167,7 @@ rocky-aarch64:
ubuntu:
erlang:
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu"
suite: "jammy"
component: "main"
gpg_key: "erlang-ppa.gpg"
@ -214,7 +214,7 @@ ubuntu:
ubuntu-aarch64:
erlang:
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu"
suite: "jammy"
component: "main"
gpg_key: "erlang-ppa.gpg"