From 7c5adf712259b4c4e9eb72f12034d4b32875dfd0 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Mon, 13 Apr 2020 20:20:14 +0530 Subject: [PATCH] Do not install mock from epel repo mock package from epel is added in RDO CentOS8 ussuri build-deps repo with [1], so let's use that instead of epel to avoid epel related issues. [1] https://review.rdoproject.org/r/#/q/topic:rdo-centos8-remove-epel Partial-Bug: #1869842 Change-Id: Ifcb1c5e64ed0005f760aef8435a980d5bdefb193 --- config/release/tripleo-ci/CentOS-8/master.yml | 9 --------- .../CentOS-8/promotion-testing-hash-master.yml | 9 --------- 2 files changed, 18 deletions(-) diff --git a/config/release/tripleo-ci/CentOS-8/master.yml b/config/release/tripleo-ci/CentOS-8/master.yml index a14c14663..fbaf0a25b 100644 --- a/config/release/tripleo-ci/CentOS-8/master.yml +++ b/config/release/tripleo-ci/CentOS-8/master.yml @@ -33,15 +33,6 @@ ipa_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo # repo setup repo_cmd_before: | - # ensure mock is installed - sudo dnf -y install epel-release - sudo dnf config-manager --enable --save epel - sudo dnf -y install mock - # the additional rpm files may also be needed - # createrepo redhat-rpm-config rpmdevtools spectool - sudo dnf config-manager --disable --save epel - sudo rpm -e epel-release || true; - sudo rm -rf /etc/yum.repos.d/delorean*; sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/epel*; diff --git a/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-master.yml b/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-master.yml index ef4d0d4cd..58a1e03f4 100644 --- a/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-master.yml +++ b/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-master.yml @@ -36,15 +36,6 @@ ipa_image_url: https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_ # something working.. IMHO may be replaced w/ tripleo-repos setup # https://review.opendev.org/#/c/709254/ repo_cmd_before: | - # ensure mock is installed - sudo dnf -y install epel-release - sudo dnf config-manager --enable --save epel - sudo dnf -y install mock - # the additional rpm files may also be needed - # createrepo redhat-rpm-config rpmdevtools spectool - sudo dnf config-manager --disable --save epel - sudo rpm -e epel-release || true; - sudo rm -rf /etc/yum.repos.d/delorean*; sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/epel*;