From 9ac74b5b7b4aa784aa3e3dcf4b80cf464fb0fda9 Mon Sep 17 00:00:00 2001 From: Artem Sidorenko Date: Thu, 27 Oct 2016 00:53:45 +0200 Subject: [PATCH] Avoid breaking of chef package resource via yum Signed-off-by: Artem Sidorenko --- fedora-23-i386.json | 1 + fedora-23-x86_64.json | 1 + fedora-24-i386.json | 1 + fedora-24-x86_64.json | 1 + scripts/fedora/yum.sh | 4 ++++ 5 files changed, 8 insertions(+) create mode 100644 scripts/fedora/yum.sh diff --git a/fedora-23-i386.json b/fedora-23-i386.json index bebadd145..002aecef1 100644 --- a/fedora-23-i386.json +++ b/fedora-23-i386.json @@ -143,6 +143,7 @@ "scripts/fedora/fix-slow-dns.sh", "scripts/common/sshd.sh", "scripts/fedora/build-tools.sh", + "scripts/fedora/yum.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", "scripts/common/parallels.sh", diff --git a/fedora-23-x86_64.json b/fedora-23-x86_64.json index 82f5e088f..64908ce55 100644 --- a/fedora-23-x86_64.json +++ b/fedora-23-x86_64.json @@ -147,6 +147,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", + "scripts/fedora/yum.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", diff --git a/fedora-24-i386.json b/fedora-24-i386.json index 2dc50354f..d9f5c7baf 100644 --- a/fedora-24-i386.json +++ b/fedora-24-i386.json @@ -141,6 +141,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", + "scripts/fedora/yum.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", diff --git a/fedora-24-x86_64.json b/fedora-24-x86_64.json index a7ce8c5bb..a56c7f141 100644 --- a/fedora-24-x86_64.json +++ b/fedora-24-x86_64.json @@ -147,6 +147,7 @@ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", "scripts/fedora/build-tools.sh", + "scripts/fedora/yum.sh", "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", diff --git a/scripts/fedora/yum.sh b/scripts/fedora/yum.sh new file mode 100644 index 000000000..c28f7556b --- /dev/null +++ b/scripts/fedora/yum.sh @@ -0,0 +1,4 @@ +#!/bin/bash -eux +# Installing yum for compatibility, especially for chef/kitchen tests +# https://github.com/chef/chef/issues/5492 +dnf -y install yum