Skip to content

Commit

Permalink
PMM-13222 Fix server-autobuild-el7 pipeline after centos 7 eol. (#3061)
Browse files Browse the repository at this point in the history
* PMM-13222 Fix server-autobuild-el7 pipeline after centos 7 eol.

* Update build/docker/server/Dockerfile

---------

Co-authored-by: Alex Demidoff <[email protected]>
  • Loading branch information
talhabinrizwan and ademidoff authored Jul 11, 2024
1 parent 1f919f3 commit ae08cd1
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/ansible/roles/pmm2-images/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
name: "*"
state: latest
exclude: "ansible*"
disablerepo: percona-release-x86_64
disablerepo: pmm2-server

- name: Packages | Update OS EL9
when:
Expand Down
9 changes: 8 additions & 1 deletion build/docker/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@ EXPOSE 80 443

WORKDIR /opt

RUN yum -y install epel-release && yum -y install ansible
# Disable fastestmirror plugin and update repo URLs
RUN 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

# Install EPEL repository and Ansible
RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
yum -y install ansible

COPY RPMS /tmp/RPMS
COPY gitCommit /tmp/gitCommit
Expand Down
8 changes: 8 additions & 0 deletions build/scripts/build-client-rpm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ 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)
Expand Down
8 changes: 8 additions & 0 deletions build/scripts/build-client-srpm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ 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
Expand Down
8 changes: 8 additions & 0 deletions build/scripts/build-server-rpm
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,14 @@ 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
Expand Down

0 comments on commit ae08cd1

Please sign in to comment.