From 8454634881e6155fb1d361e3754ab3972fd02f33 Mon Sep 17 00:00:00 2001 From: Arx Cruz Date: Wed, 26 May 2021 15:31:44 +0200 Subject: [PATCH] Add edk2 on exclude list for AppStream repo Due a bug on edk2 we need to exclude it from stable branches. Related-Bug: #1929634 See rhbz: #1961558 Change-Id: I87521c2f6f449f36853ea79303921b4f47bf2e96 --- tripleo_repos/main.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tripleo_repos/main.py b/tripleo_repos/main.py index 3e09196..6f299b7 100755 --- a/tripleo_repos/main.py +++ b/tripleo_repos/main.py @@ -81,6 +81,7 @@ name=CentOS-$releasever - AppStream baseurl=%(mirror)s/centos/$releasever/AppStream/$basearch/os/ gpgcheck=0 enabled=1 +%(extra)s ''' BASE_REPO_TEMPLATE = ''' [BaseOS] @@ -492,7 +493,14 @@ def _install_repos(args, base_path): distro_path = "/etc/distro.repos.d" else: distro_path = args.output_path - content = APPSTREAM_REPO_TEMPLATE % {'mirror': args.mirror} + # TODO: Remove it once bugs are fixed + # Add extra options to APPSTREAM_REPO_TEMPLATE because of + # rhbz/1961558 and lpbz/1929634 + extra = '' + if args.branch in ['train', 'ussuri', 'victoria']: + extra = 'exclude=edk2-ovmf-20200602gitca407c7246bf-5*' + content = APPSTREAM_REPO_TEMPLATE % {'mirror': args.mirror, + 'extra': extra} _write_repo(content, distro_path) content = BASE_REPO_TEMPLATE % {'mirror': args.mirror} _write_repo(content, distro_path)