From e6d06a6f92d0c28e5307ab269d43a5ae8832957d Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Wed, 15 Nov 2023 22:36:20 +0200 Subject: [PATCH] Provisioning: Make RHEL versions static MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With new CI policy to always update packages when provisioning changes, but system & packages are tied to a specific RHEL release i.e. --set=9.2 This could reduce unwanted upgrades and make provisioning more stable. Task-number: QTQAINFRA-5658 Pick-to: 6.7 Change-Id: I898a793acf152ebb6e1f31c9b26a98f47145bd5a Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi --- .../qtci-linux-RHEL-8.2-x86_64/03-enable-repos.sh | 5 +++++ .../qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-8.4-x86_64/03-enable-repos.sh | 5 +++++ .../qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-8.6-x86_64/03-enable-repos.sh | 5 +++++ .../qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-8.8-x86_64/03-enable-repos.sh | 5 +++++ .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 4 ++++ .../qtci-linux-RHEL-9.0-x86_64/03-enable-repos.sh | 5 +++++ .../qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-9.2-x86_64/03-enable-repos.sh | 5 +++++ .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 6 ++++++ 12 files changed, 50 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/03-enable-repos.sh index 410fb211..4f6c6d18 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/03-enable-repos.sh @@ -12,6 +12,11 @@ sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=1 sudo subscription-manager refresh +# List available RHEL versions and bind with correct one +sudo subscription-manager release --list +sudo subscription-manager release --set=8.2 +sudo yum clean all + # sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms' sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms' sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms' diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh index f049aefd..fda995ca 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh @@ -7,6 +7,9 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +# CI: All platforms should have up-to-date packages when new provision is made +sudo yum -y update + installPackages=() installPackages+=(git) installPackages+=(zlib-devel) diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/03-enable-repos.sh index 410fb211..4de5f9d8 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/03-enable-repos.sh @@ -12,6 +12,11 @@ sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=1 sudo subscription-manager refresh +# List available RHEL versions and bind with correct one +sudo subscription-manager release --list +sudo subscription-manager release --set=8.4 +sudo yum clean all + # sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms' sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms' sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms' diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh index c692081e..da03076a 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh @@ -7,6 +7,9 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +# CI: All platforms should have up-to-date packages when new provision is made +sudo yum -y update + installPackages=() installPackages+=(git) installPackages+=(zlib-devel) diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/03-enable-repos.sh index 65384f7d..64bf2e93 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/03-enable-repos.sh @@ -17,6 +17,11 @@ sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=1 sudo subscription-manager refresh +# List available RHEL versions and bind with correct one +sudo subscription-manager release --list +sudo subscription-manager release --set=8.6 +sudo yum clean all + # sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms' sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms' sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms' diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh index f81498b6..9a81bd12 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh @@ -8,6 +8,7 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +# CI: All platforms should have up-to-date packages when new provision is made sudo yum -y update installPackages=() diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-enable-repos.sh index 65384f7d..1ad60c7d 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-enable-repos.sh @@ -17,6 +17,11 @@ sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=1 sudo subscription-manager refresh +# List available RHEL versions and bind with correct one +sudo subscription-manager release --list +sudo subscription-manager release --set=8.8 +sudo yum clean all + # sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms' sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms' sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms' diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 99976038..be4d90af 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -8,6 +8,7 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +# CI: All platforms should have up-to-date packages when new provision is made sudo yum -y update installPackages=() @@ -166,3 +167,6 @@ sudo /usr/bin/pip3 install dataclasses OpenSSLVersion="$(openssl3 version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt + +# List all available updates +sudo yum -y list updates diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/03-enable-repos.sh index 61d500cf..f2ac6a71 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/03-enable-repos.sh @@ -16,6 +16,11 @@ sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=1 sudo subscription-manager refresh +# List available RHEL versions and bind with correct one +sudo subscription-manager release --list +sudo subscription-manager release --set=9.0 +sudo yum clean all + # sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms' sudo yum config-manager --enable 'codeready-builder-for-rhel-9-x86_64-rpms' sudo yum config-manager --enable 'rhel-9-for-x86_64-baseos-rpms' diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh index 838fa7bf..c843bbd0 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh @@ -7,6 +7,9 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +# CI: All platforms should have up-to-date packages when new provision is made +sudo yum -y update + installPackages=() installPackages+=(git) installPackages+=(zlib-devel) diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/03-enable-repos.sh index b86053ee..33f2faa9 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/03-enable-repos.sh @@ -17,6 +17,11 @@ sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=1 sudo subscription-manager refresh +# List available RHEL versions and bind with correct one +sudo subscription-manager release --list +sudo subscription-manager release --set=9.2 +sudo yum clean all + # sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms' sudo yum config-manager --enable 'codeready-builder-for-rhel-9-x86_64-rpms' sudo yum config-manager --enable 'rhel-9-for-x86_64-baseos-rpms' diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index 7486045f..44518e94 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -7,6 +7,9 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +# CI: All platforms should have up-to-date packages when new provision is made +sudo yum -y update + installPackages=() installPackages+=(git) installPackages+=(zlib-devel) @@ -177,3 +180,6 @@ sudo ln -s /usr/bin/python3 /usr/local/bin/python3 OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt + +# List all available updates +sudo yum -y list updates