srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-21 21:43:08 +00:00
Code Issues Releases Activity

_ostree_build: handle change to repos in workstation-ostree-config

Browse Source 
The place where repos are defined changed on the F40+ branches
of workstation-ostree-config, this handles both possibilities.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-02-14 12:29:51 -08:00
parent f8f1d0d433
commit b371331436
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup_repos.py
View File

@ -39,8 +39,8 @@ import sys
# these are variables to make testing this script easier...change them # these are variables to make testing this script easier...change them
# to /tmp for testing # to /tmp for testing
WORKAROUNDS_DIR = "/mnt/workarounds_repo" WORKAROUNDS_DIR = "/tmp/workarounds_repo"
UPDATES_DIR = "/mnt/update_repo" UPDATES_DIR = "/tmp/update_repo"
UPDATES_FILE_PATH = "/mnt" UPDATES_FILE_PATH = "/mnt"

5
tests/_ostree_build.pm
View File

@ -51,7 +51,12 @@ sub run {
$repl .= '\n - koji-rawhide' if ($version eq $rawrel); $repl .= '\n - koji-rawhide' if ($version eq $rawrel);
$repl .= '\n - advisory' unless ($tag); $repl .= '\n - advisory' unless ($tag);
$repl .= '\n - openqa-testtag' if ($tag); $repl .= '\n - openqa-testtag' if ($tag);
# Up to Fedora 39, repo definitions are in the subvariant config...
assert_script_run 'sed -i -e "s,repos:,' . $repl . ',g" fedora-' . $lcsubv . '.yaml'; assert_script_run 'sed -i -e "s,repos:,' . $repl . ',g" fedora-' . $lcsubv . '.yaml';
# From Fedora 40 onwards, they're in the common config. Let's just
# unconditionally sub both, as this is harmless when the file does
# not have 'repos:' in it
assert_script_run 'sed -i -e "s,repos:,' . $repl . ',g" fedora-common-ostree.yaml';
# change the ref name to a custom one (so we can test rebasing to # change the ref name to a custom one (so we can test rebasing to
# the 'normal' ref later) # the 'normal' ref later)
assert_script_run 'sed -i -e "s,ref: fedora/,ref: fedora-openqa/,g" fedora-' . $lcsubv . '.yaml'; assert_script_run 'sed -i -e "s,ref: fedora/,ref: fedora-openqa/,g" fedora-' . $lcsubv . '.yaml';