summaryrefslogtreecommitdiff
path: root/contrib/cirrus/setup_environment.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2020-04-15 12:01:23 -0400
committerChris Evich <cevich@redhat.com>2020-04-24 08:22:50 -0400
commit97ecd21b59fd6cd3b45cf1742f60eff6d32eef3d (patch)
tree54c7d6fc02cbcd71d1de8e215780fa6aee68a58a /contrib/cirrus/setup_environment.sh
parent2c457a632c73cad3acfd5946633e67ef26211b34 (diff)
downloadpodman-97ecd21b59fd6cd3b45cf1742f60eff6d32eef3d.tar.gz
podman-97ecd21b59fd6cd3b45cf1742f60eff6d32eef3d.tar.bz2
podman-97ecd21b59fd6cd3b45cf1742f60eff6d32eef3d.zip
Cirrus: Unify package installation
Also, test-build critical container images depended upon for CI-purposes. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh10
1 files changed, 1 insertions, 9 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 57c9ec52a..6bec9625e 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -43,16 +43,8 @@ case "${OS_RELEASE_ID}" in
fedora)
# All SELinux distros need this for systemd-in-a-container
setsebool container_manage_cgroup true
- if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
- bash "$SCRIPT_BASE/add_second_partition.sh"
- fi
- if [[ $OS_RELEASE_VER -le 31 ]]; then
- warn "Switching io scheduler to 'deadline' to avoid RHBZ 1767539"
- warn "aka https://bugzilla.kernel.org/show_bug.cgi?id=205447"
- echo "mq-deadline" > /sys/block/sda/queue/scheduler
- cat /sys/block/sda/queue/scheduler
- fi
+ workaround_bfq_bug
if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
bash "$SCRIPT_BASE/add_second_partition.sh"