PMM-12641 cleanup RH7 tweaks

percona · Oct 18, 2024 · e7751f3 · e7751f3
1 parent 6a15fd4
commit e7751f3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 26 deletions.
diff --git a/build/scripts/build-client-rpm b/build/scripts/build-client-rpm
@@ -14,14 +14,6 @@ main() {
         set -o errexit
         set -o xtrace
 
-        if grep -q 'CentOS Linux 7' /etc/os-release; then
-            # disable fastestmirror plugin, which mostly fails due to CentOS 7 being EOL
-            sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf
-
-            sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo
-            sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo
-        fi
-
         export pmm_version=$pmm_version
         export pmm_release=$pmm_release
         export sudo_path=\$(ls /usr/bin/sudo)

diff --git a/build/scripts/build-client-srpm b/build/scripts/build-client-srpm
@@ -14,14 +14,6 @@ main() {
         set -o errexit
         set -o xtrace
 
-        if grep -q 'CentOS Linux 7' /etc/os-release; then
-            # disable fastestmirror plugin, which mostly fails due to CentOS 7 being EOL
-            sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf
-
-            sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo
-            sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo
-        fi
-
         export pmm_release=$pmm_release
         export sudo_path=
         if [ -e /usr/bin/sudo ]; then

diff --git a/build/scripts/build-server-rpm b/build/scripts/build-server-rpm
@@ -26,9 +26,7 @@ is_build_needed() {
     local packages=
 
     # Structure of S3 build cache
-    # s3://pmm-build-cache/PR-BUILDS/7 - el7
     # s3://pmm-build-cache/PR-BUILDS/9 - el9
-    # s3://pmm-build-cache/RELEASE/7 - el7
     # s3://pmm-build-cache/RELEASE/9 - el9
 
     # RPM_EPOCH is set for Feature Builds
@@ -109,14 +107,6 @@ build() {
             echo \"repo_name: ${repo_name}\"
             echo \"rpm_verison: ${rpm_version}\"
 
-            if grep -q 'CentOS Linux 7' /etc/os-release; then
-                # disable fastestmirror plugin, which mostly fails due to CentOS 7 being EOL
-                sudo sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf
-
-                sudo sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo
-                sudo sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo
-            fi
-
             sudo chown -R builder:builder /home/builder/rpm/RPMS /home/builder/rpm/SOURCES
 
             # Add 'Epoch' to spec file to prevent update of rpms which are built in PR build