From 64f21fd0cca15e6d67a90da1abd15be8ac8391cf Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Mon, 23 Nov 2020 10:18:54 +0200 Subject: [PATCH] Repo-clones taken into use in Centos 8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3896 Change-Id: Id559af7421d592d75c91fe57060f8787ec4fd742 Reviewed-by: Tony Sarajärvi --- .../02-install-rhel-epel.sh | 50 ------------------- .../03-enable-repos.sh | 50 +++++++++++++++++-- 2 files changed, 45 insertions(+), 55 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/02-install-rhel-epel.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/02-install-rhel-epel.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/02-install-rhel-epel.sh deleted file mode 100755 index 69e3e3c3..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/02-install-rhel-epel.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2020 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -package="epel-release-latest-8.noarch.rpm" -primaryUrl="https://dl.fedoraproject.org/pub/epel/$package" -cacheUrl="http://ci-files01-hki.intra.qt.io/input/centos/$package" -sha256="8949517e8a84556d06dba8b030fb5bc4553474b352d7ce25799469aa9af4cc62" -targetFile="/tmp/$package" - -DownloadURL "$cacheUrl" "$primaryUrl" "$sha256" "$targetFile" - -sudo yum -y install "$targetFile" -rm "$targetFile" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh index f5e9e6a5..93aa2778 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh @@ -35,10 +35,50 @@ set -ex -sudo yum -y install yum-utils +sudo rm -f /etc/yum.repos.d/*.repo -sudo yum-config-manager --enable AppStream -sudo yum-config-manager --enable PowerTools -sudo yum-config-manager --enable BaseOS -sudo yum-config-manager --enable epel-playground +sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <