anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0065-travis-drop-the-SELinux-Fedora-workaround.patch

36e8a3
From 2d674d48e9ca48e3bb126f20b59334100d926a23 Mon Sep 17 00:00:00 2001
36e8a3
From: Frantisek Sumsal <fsumsal@redhat.com>
36e8a3
Date: Tue, 15 Jan 2019 11:03:45 +0100
36e8a3
Subject: [PATCH] travis: drop the SELinux Fedora workaround
36e8a3
36e8a3
(cherry picked from commit 90399c456fe8cf726fc04fb7be9e2a01f9ca0eae)
36e8a3
---
36e8a3
 ci/travis-centos-rhel7.sh | 2 +-
36e8a3
 ci/travis-centos-rhel8.sh | 2 +-
36e8a3
 2 files changed, 2 insertions(+), 2 deletions(-)
36e8a3
36e8a3
diff --git a/ci/travis-centos-rhel7.sh b/ci/travis-centos-rhel7.sh
4bff0a
index 60bbdf14c2..b1b3de1cc2 100755
36e8a3
--- a/ci/travis-centos-rhel7.sh
36e8a3
+++ b/ci/travis-centos-rhel7.sh
36e8a3
@@ -40,7 +40,7 @@ for phase in "${PHASES[@]}"; do
36e8a3
             sleep 1
36e8a3
             $DOCKER_EXEC yum makecache
36e8a3
             # Install necessary build/test requirements
36e8a3
-            $DOCKER_EXEC yum -y --exclude selinux-policy\* upgrade
36e8a3
+            $DOCKER_EXEC yum -y upgrade
36e8a3
             $DOCKER_EXEC yum -y install "${ADDITIONAL_DEPS[@]}"
36e8a3
             $DOCKER_EXEC yum-builddep -y systemd
36e8a3
             ;;
36e8a3
diff --git a/ci/travis-centos-rhel8.sh b/ci/travis-centos-rhel8.sh
4bff0a
index 968603f949..8eda5e982f 100755
36e8a3
--- a/ci/travis-centos-rhel8.sh
36e8a3
+++ b/ci/travis-centos-rhel8.sh
36e8a3
@@ -45,7 +45,7 @@ for phase in "${PHASES[@]}"; do
36e8a3
             $DOCKER_EXEC curl "$COPR_REPO" -o "$COPR_REPO_PATH"
36e8a3
             $DOCKER_EXEC yum -q -y install epel-release yum-utils
36e8a3
             $DOCKER_EXEC yum-config-manager -q --enable epel
36e8a3
-            $DOCKER_EXEC yum -y --exclude selinux-policy\* upgrade
36e8a3
+            $DOCKER_EXEC yum -y upgrade
36e8a3
             # Install necessary build/test requirements
36e8a3
             $DOCKER_EXEC yum -y install "${ADDITIONAL_DEPS[@]}"
36e8a3
             $DOCKER_EXEC python3.6 -m ensurepip