diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-03-09 14:21:52 +0200 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-03-20 09:59:43 +0000 |
| commit | d4c38f8da9e6b63282a924dac87b958ad15e6f5b (patch) | |
| tree | a217f179fadfd9c2a5dab34ab6db87cbb4ea72f3 /coin | |
| parent | 677524620d5e8a8af96fa9395e3b3d342f113158 (diff) | |
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 <timo.aarnipuro@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 209cb73a363d794ad312e28f9ea38bb8ef8b47bb)
Diffstat (limited to 'coin')
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 <<EOC +[rhel-7-workstation-rpms] +metadata_expire = 86400 +baseurl = http://repo-clones.ci.qt.io/repos/rhel-7-workstation-rpms +ui_repoid_vars = releasever basearch +name = Qt Red Hat Enterprise Linux 7 Workstation (RPMs) +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +enabled = 1 +gpgcheck = 1 + +[rhel-7-workstation-optional-rpms] +metadata_expire = 86400 +baseurl = http://repo-clones.ci.qt.io/repos/rhel-7-workstation-optional-rpms +ui_repoid_vars = releasever basearch +name = Qt Red Hat Enterprise Linux 7 Workstation - Optional (RPMs) +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +enabled = 1 +gpgcheck = 1 + +[rhel-workstation-rhscl-7-rpms] +metadata_expire = 86400 +baseurl = http://repo-clones.ci.qt.io/repos/rhel-workstation-rhscl-7-rpms +ui_repoid_vars = releasever basearch +name = Qt Red Hat Software Collections RPMs for Red Hat Enterprise Linux 7 Workstation +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +enabled = 1 +gpgcheck = 1 +EOC diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh index f3b90756..ebc7cac6 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh @@ -35,7 +35,6 @@ set -ex -sudo yum-config-manager --enable rhel-server-rhscl7-rpms sudo yum -y install devtoolset-4 echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc |