From 92fe27bf0466a39a0e8c1e660f92ee05fba95c11 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Mon, 1 Jul 2024 18:25:47 +0100 Subject: [PATCH] Docker: Fix Use Of mirrorlist.centos.org in dockerfiles and Unix playbooks. (#3643) * docker: Update Centos 7 Image File To Use Vault Rather Than Mirror list. * Vagrant: Update Centos7 Vagrantfiile to replace mirrorlist * UnixPB: Update Centos7 SCL Repositories To Not Use Vault & Not Mirrrorlist. --- ansible/docker/Dockerfile.CentOS7 | 7 +++- .../roles/Common/tasks/CentOS.yml | 39 +++++++++++++++++++ ansible/vagrant/Vagrantfile.CentOS7 | 4 ++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/ansible/docker/Dockerfile.CentOS7 b/ansible/docker/Dockerfile.CentOS7 index ee71aea385..4d7da7fab5 100644 --- a/ansible/docker/Dockerfile.CentOS7 +++ b/ansible/docker/Dockerfile.CentOS7 @@ -3,8 +3,11 @@ FROM centos:7 ARG git_sha ARG user=jenkins -RUN yum -y update; yum -y install epel-release -RUN yum -y install ansible sudo; yum clean all +RUN sed -i -e 's!mirrorlist!#mirrorlist!g' /etc/yum.repos.d/CentOS-Base.repo; \ + sed -i -e 's!#baseurl=http://mirror.centos.org/centos/\$releasever!baseurl=https://vault.centos.org/7.9.2009/!g' /etc/yum.repos.d/CentOS-Base.repo; \ + yum -y update; yum clean all; \ + yum -y install epel-release; \ + yum -y install ansible sudo; yum clean all COPY . /ansible diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml index 079cb95eb0..2aa545141a 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml @@ -153,6 +153,45 @@ - ansible_architecture == "x86_64" and ansible_distribution_major_version == "6" tags: build_tools +- name: Change the baseurl for CentOS SCL (CentOS7) + lineinfile: + path: /etc/yum.repos.d/CentOS-SCLo-scl.repo + regexp: '^# baseurl=http://mirror.centos.org/centos/7/sclo/\$basearch/sclo/' + line: 'baseurl=https://vault.centos.org/7.9.2009/sclo/$basearch/sclo/' + state: present + when: + - ansible_architecture == "x86_64" and ansible_distribution_major_version == "7" + tags: build_tools + +- name: Change the baseurl for CentOS SCL RH (CentOS7) + lineinfile: + path: /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo + regexp: '^#baseurl=http://mirror.centos.org/centos/7/sclo/\$basearch/rh/' + line: 'baseurl=https://vault.centos.org/7.9.2009/sclo/$basearch/rh/' + state: present + when: + - ansible_architecture == "x86_64" and ansible_distribution_major_version == "7" + tags: build_tools + +# - name: Remove the mirrorlist URL for Centos 7 SCL Repositories +# shell: | +# sed -i -e 's!^mirrorlist!#mirrorlist!g' /etc/yum.repos.d/CentOS-SCLo-scl*.repo +# when: +# - ansible_architecture == "x86_64" and ansible_distribution_major_version == "7" +# tags: build_tools + +- name: Remove the mirrorlist URL for Centos 7 SCL Repositories + lineinfile: + path: "{{ item }}" + regexp: '^mirrorlist' + line: '#mirrorlist' + state: present + with_fileglob: + - /etc/yum.repos.d/CentOS-SCLo-scl*.repo + when: + - ansible_architecture == "x86_64" and ansible_distribution_major_version == "7" + tags: build_tools + - name: Install additional build tools for CentOS on x86 package: "name={{ item }} state=latest" with_items: "{{ Additional_Build_Tools_CentOS_x86 }}" diff --git a/ansible/vagrant/Vagrantfile.CentOS7 b/ansible/vagrant/Vagrantfile.CentOS7 index 5293059f62..ba133aed22 100644 --- a/ansible/vagrant/Vagrantfile.CentOS7 +++ b/ansible/vagrant/Vagrantfile.CentOS7 @@ -2,9 +2,13 @@ # vi: set ft=ruby : $script = <