From c8ccbe27bfda2c4fea6a452fd6e5701f20f59ce1 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Mon, 25 Jun 2018 21:29:45 +0200 Subject: [PATCH] Fix rabbitmq_* integration tests (#41836) (cherry picked from commit a8d4bf86421d151d8df7132e8e87d04b6662f45a) --- test/integration/targets/rabbitmq_plugin/aliases | 1 - test/integration/targets/rabbitmq_user/aliases | 1 - test/integration/targets/rabbitmq_vhost/aliases | 1 - .../targets/setup_rabbitmq/tasks/ubuntu.yml | 13 +++++++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/test/integration/targets/rabbitmq_plugin/aliases b/test/integration/targets/rabbitmq_plugin/aliases index 1248b88714c..c9a649c10c2 100644 --- a/test/integration/targets/rabbitmq_plugin/aliases +++ b/test/integration/targets/rabbitmq_plugin/aliases @@ -3,4 +3,3 @@ posix/ci/group1 skip/osx skip/freebsd skip/rhel -disabled diff --git a/test/integration/targets/rabbitmq_user/aliases b/test/integration/targets/rabbitmq_user/aliases index 1248b88714c..c9a649c10c2 100644 --- a/test/integration/targets/rabbitmq_user/aliases +++ b/test/integration/targets/rabbitmq_user/aliases @@ -3,4 +3,3 @@ posix/ci/group1 skip/osx skip/freebsd skip/rhel -disabled diff --git a/test/integration/targets/rabbitmq_vhost/aliases b/test/integration/targets/rabbitmq_vhost/aliases index 1248b88714c..c9a649c10c2 100644 --- a/test/integration/targets/rabbitmq_vhost/aliases +++ b/test/integration/targets/rabbitmq_vhost/aliases @@ -3,4 +3,3 @@ posix/ci/group1 skip/osx skip/freebsd skip/rhel -disabled diff --git a/test/integration/targets/setup_rabbitmq/tasks/ubuntu.yml b/test/integration/targets/setup_rabbitmq/tasks/ubuntu.yml index db7e7a9c460..41e116aa54f 100644 --- a/test/integration/targets/setup_rabbitmq/tasks/ubuntu.yml +++ b/test/integration/targets/setup_rabbitmq/tasks/ubuntu.yml @@ -1,5 +1,18 @@ --- +# https://www.rabbitmq.com/install-debian.html#apt-pinning +- name: Pin erlang version that rabbitmq supports + copy: + dest: /etc/apt/preferences.d/erlang + content: | + Package: erlang* + Pin: version 1:20.1-1 + Pin-Priority: 1000 + + Package: esl-erlang + Pin: version 1:20.1.7 + Pin-Priority: 1000 + - name: Install https transport for apt apt: name=apt-transport-https state=latest force=yes