Skip to content

Commit

Permalink
bots: Fix rhel-7-6 install script
Browse files Browse the repository at this point in the history
Commit b738b09 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).
  • Loading branch information
martinpitt committed Jul 25, 2018
1 parent 60f9bd1 commit 9affa15
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
1 change: 0 additions & 1 deletion bots/images/scripts/rhel-7-5.install

This file was deleted.

8 changes: 8 additions & 0 deletions bots/images/scripts/rhel-7-5.install
Original file line number Diff line number Diff line change
@@ -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 "$@"
1 change: 0 additions & 1 deletion bots/images/scripts/rhel-7-6.install

This file was deleted.

5 changes: 5 additions & 0 deletions bots/images/scripts/rhel-7-6.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#! /bin/bash

set -e

/var/lib/testvm/fedora.install --rhel "$@"
8 changes: 0 additions & 8 deletions bots/images/scripts/rhel.install

This file was deleted.

0 comments on commit 9affa15

Please sign in to comment.