-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
1 parent
60f9bd1
commit 9affa15
Showing
3 changed files
with
13 additions
and
10 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 "$@" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
#! /bin/bash | ||
|
||
set -e | ||
|
||
/var/lib/testvm/fedora.install --rhel "$@" |
This file was deleted.
Oops, something went wrong.