containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Avoid upgrading grub-efi-amd64-signed 

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2020-10-29 14:49:32 -04:00
parent 305cc433fd
commit ed27f581ca
No known key found for this signature in database
GPG Key ID: 03EDC70FD578067F
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/cirrus/lib.sh
View File

@ -99,6 +99,9 @@ RPMS_CONFLICTING="gcc-go"
# https://github.com/containers/libpod/blob/master/contrib/cirrus/packer/ubuntu_setup.sh
DEBS_REQUIRED="parallel"
DEBS_CONFLICTING=""
# Upgrading grub-efi-amd64-signed doesn't make sense at test-runtime
# and has some config. scripts which frequently fail. Block updates
DEBS_HOLD="grub-efi-amd64-signed"
# For devicemapper testing, device names need to be passed down for use in tests
if [[ "$TEST_DRIVER" == "devicemapper" ]]; then

2
contrib/cirrus/setup.sh
View File

@ -26,6 +26,8 @@ case "$OS_RELEASE_ID" in
;;
ubuntu)
$SHORT_APTGET update # Fetch latest package metadata
[[ -z "$DEBS_HOLD" ]] || \
apt-mark hold $DEBS_HOLD
$LONG_APTGET upgrade # install latest packages
[[ -z "$DEBS_REQUIRED" ]] || \
$SHORT_APTGET -q install $DEBS_REQUIRED