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