From 209cb73a363d794ad312e28f9ea38bb8ef8b47bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 9 Mar 2018 14:21:52 +0200 Subject: Use local RHEL repositories with RHEL 7.4 This will remove the majority of our network traffic from the outbound connection while provisioning. Also proxy was removed for yum, as there is no point in proxying local data. As a side effect, this makes provisioning currently faster by reducing the time it takes by 35%. Task-number: QTQAINFRA-1849 Change-Id: Ida4fb86d4bef166fc72e521e395d9753ec47a687 Reviewed-by: Timo Aarnipuro Reviewed-by: Sami Nurmenniemi Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 5 ---- .../qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh | 32 +++++++++++++++++++++- .../03-install-devtoolset.sh | 1 - 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index bf97a166..85ceaa24 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -36,7 +36,6 @@ set -ex BASEDIR=$(dirname "$0") -source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" source $BASEDIR/../common/shared/network_test_server_ip.txt echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" @@ -50,7 +49,3 @@ export DISPLAY=:0 gsettings set org.gnome.desktop.screensaver lock-enabled false # disable blank screen power saving gsettings set org.gnome.desktop.session idle-delay 0 - -if [ "$http_proxy" != "" ]; then - echo "proxy=$proxy" | sudo tee -a /etc/yum.conf -fi diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh index 8f080992..1f9ddb22 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh @@ -35,4 +35,34 @@ set -ex -sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms +sudo subscription-manager config --rhsm.manage_repos=0 +sudo subscription-manager refresh + +sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <> ~/.bashrc -- cgit v1.2.3