From 9affa15b5c4a05e907cb152bff92e30996af0b33 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Wed, 25 Jul 2018 11:57:21 +0200
Subject: [PATCH] bots: Fix rhel-7-6 install script

Commit b738b0947f caused rhel-7-6 to use the install script for rhel-7-5
that removed the pre-installed cockpit packages. This fails for the
rhel-7-6 image, as this does not have cockpit packages preinstalled.

Give each image its own script again, as they are already just simple
wrappers around fedora.install, and we sometimes need to customize them
(like rhel-x.install).
---
 bots/images/scripts/rhel-7-5.install | 9 ++++++++-
 bots/images/scripts/rhel-7-6.install | 6 +++++-
 bots/images/scripts/rhel.install     | 8 --------
 3 files changed, 13 insertions(+), 10 deletions(-)
 mode change 120000 => 100755 bots/images/scripts/rhel-7-5.install
 mode change 120000 => 100755 bots/images/scripts/rhel-7-6.install
 delete mode 100755 bots/images/scripts/rhel.install

diff --git a/bots/images/scripts/rhel-7-5.install b/bots/images/scripts/rhel-7-5.install
deleted file mode 120000
index 45df18fae6c1..000000000000
--- a/bots/images/scripts/rhel-7-5.install
+++ /dev/null
@@ -1 +0,0 @@
-rhel.install
\ No newline at end of file
diff --git a/bots/images/scripts/rhel-7-5.install b/bots/images/scripts/rhel-7-5.install
new file mode 100755
index 000000000000..cc9b92b06f50
--- /dev/null
+++ b/bots/images/scripts/rhel-7-5.install
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+set -e
+
+# remove cockpit distro packages, testing with upstream master
+rpm --erase --verbose cockpit cockpit-ws cockpit-bridge cockpit-system
+
+/var/lib/testvm/fedora.install --rhel "$@"
diff --git a/bots/images/scripts/rhel-7-6.install b/bots/images/scripts/rhel-7-6.install
deleted file mode 120000
index 45df18fae6c1..000000000000
--- a/bots/images/scripts/rhel-7-6.install
+++ /dev/null
@@ -1 +0,0 @@
-rhel.install
\ No newline at end of file
diff --git a/bots/images/scripts/rhel-7-6.install b/bots/images/scripts/rhel-7-6.install
new file mode 100755
index 000000000000..cad8786c6aac
--- /dev/null
+++ b/bots/images/scripts/rhel-7-6.install
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+set -e
+
+/var/lib/testvm/fedora.install --rhel "$@"
diff --git a/bots/images/scripts/rhel.install b/bots/images/scripts/rhel.install
deleted file mode 100755
index cc9b92b06f50..000000000000
--- a/bots/images/scripts/rhel.install
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/bash
-
-set -e
-
-# remove cockpit distro packages, testing with upstream master
-rpm --erase --verbose cockpit cockpit-ws cockpit-bridge cockpit-system
-
-/var/lib/testvm/fedora.install --rhel "$@"