diff options
| -rw-r--r-- | .zuul.d/debian.yaml | 4 | ||||
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml index d7aefe5fd..ad8706b7d 100644 --- a/.zuul.d/debian.yaml +++ b/.zuul.d/debian.yaml @@ -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 diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 311a2917d..da40ea6c0 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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'}, ] %} diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 9cdcf8749..6d2d130ff 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -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" |