testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-11-25 14:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop one old regex bit from install source check

Browse Source 
Not needed now F28 is EOL.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-08-20 12:06:33 -07:00
parent 0d66b4bbcd
commit d4206ee732
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/_check_install_source.pm
View File

@ -56,14 +56,12 @@ sub run {
# interpreted by perl. And we need quotes around the entire # interpreted by perl. And we need quotes around the entire
# expression at the bash level, and single quotes around the # expression at the bash level, and single quotes around the
# text 'anaconda' at the level of grep, as the string we're # text 'anaconda' at the level of grep, as the string we're
# actually matching on literally has 'anaconda' in it. We need # actually matching on literally has 'anaconda' in it.
# (added|enabled) till F28 goes EOL: the log line was changed # ('anaconda'|'') is a workaround for an anaconda bug that
# in Rawhide after F28 came out. ('anaconda'|'') is a work # happens since 2018-06, can be removed after
# around for an anaconda bug that only appears in F29-era # https://github.com/rhinstaller/anaconda/pull/1519 is merged
# Rawhide, can be removed when a build with # and all previous releases go EOL.
# https://github.com/rhinstaller/anaconda/pull/1519 assert_script_run 'grep "enabled repo: ' . "\\('anaconda'\\|''\\).*${repourl}" . '" /tmp/packaging.log';
# is done.
assert_script_run 'grep "\(added\|enabled\) repo: ' . "\\('anaconda'\\|''\\).*${repourl}" . '" /tmp/packaging.log';
} }
if ($repourl) { if ($repourl) {
# check we don't have an error indicating our repo wasn't used. # check we don't have an error indicating our repo wasn't used.