richardphibel / rpms / systemd

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