From c865d1882955b238f9a9a40ed572b5a985bc1e62 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Apr 07 2021 22:35:29 +0000 Subject: travis: drop the SELinux Fedora workaround (cherry picked from commit 90399c456fe8cf726fc04fb7be9e2a01f9ca0eae) patch_name: 0065-travis-drop-the-SELinux-Fedora-workaround.patch present_in_specfile: true location_in_specfile: 65 squash_commits: true --- diff --git a/ci/travis-centos-rhel7.sh b/ci/travis-centos-rhel7.sh index 60bbdf1..b1b3de1 100755 --- a/ci/travis-centos-rhel7.sh +++ b/ci/travis-centos-rhel7.sh @@ -40,7 +40,7 @@ for phase in "${PHASES[@]}"; do sleep 1 $DOCKER_EXEC yum makecache # Install necessary build/test requirements - $DOCKER_EXEC yum -y --exclude selinux-policy\* upgrade + $DOCKER_EXEC yum -y upgrade $DOCKER_EXEC yum -y install "${ADDITIONAL_DEPS[@]}" $DOCKER_EXEC yum-builddep -y systemd ;; diff --git a/ci/travis-centos-rhel8.sh b/ci/travis-centos-rhel8.sh index 968603f..8eda5e9 100755 --- a/ci/travis-centos-rhel8.sh +++ b/ci/travis-centos-rhel8.sh @@ -45,7 +45,7 @@ for phase in "${PHASES[@]}"; do $DOCKER_EXEC curl "$COPR_REPO" -o "$COPR_REPO_PATH" $DOCKER_EXEC yum -q -y install epel-release yum-utils $DOCKER_EXEC yum-config-manager -q --enable epel - $DOCKER_EXEC yum -y --exclude selinux-policy\* upgrade + $DOCKER_EXEC yum -y upgrade # Install necessary build/test requirements $DOCKER_EXEC yum -y install "${ADDITIONAL_DEPS[@]}" $DOCKER_EXEC python3.6 -m ensurepip