Skip to content

Include livepatches variables in openqa.cmd #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Draft

Include livepatches variables in openqa.cmd #322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion script/cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,8 @@ def pre_openqa_call_start(repos):
openqa_call_start = lambda distri, version, archs, staging, news, news_archs, flavor_distri, meta_variables, assets_flavor, repo0folder, openqa_cli: '''
archs=(ARCHITECTURS)
[ ! -f __envsub/files_repo.lst ] || ! grep -q -- "-POOL-" __envsub/files_repo.lst || additional_repo_suffix=-POOL

declare -a livepatches
livepatches=(NONE)
for flavor in {FLAVORALIASLIST,}; do
for arch in "${archs[@]}"; do
filter=$flavor
Expand All @@ -326,6 +327,10 @@ def pre_openqa_call_start(repos):
[ -n "$iso" ] || [ "$flavor" != "''' + assets_flavor + r'''" ] || buildex=$(grep -o -E '(Build|Snapshot)[^-]*' __envsub/files_asset.lst | head -n 1)
[ -n "$iso$build" ] || build=$(grep -h -o -E '(Build|Snapshot)[^-]*' __envsub/Media1*.lst 2>/dev/null | head -n 1 | grep -o -E '[0-9]\.?[0-9]+(\.[0-9]+)*')|| :
[ -n "$build" ] || continue
livepatches=($(grep -oP '(?<=kernel-livepatch-)\d+_\d+_\d+-\d+' "/var/lib/openqa/factory/iso/${iso}" | uniq))
if [ ${#livepatches[@]} -eq 0 ]; then
livepatches=(NONE)
fi
buildex=${buildex/.install.iso/}
buildex=${buildex/.iso/}
buildex=${buildex/.raw.xz/}
Expand All @@ -342,7 +347,12 @@ def pre_openqa_call_start(repos):
}
fi
# test "$destiso" != "" || continue
for livepatch in "${livepatches[@]}"; do
echo "''' + openqa_cli + ''' \\\\\"
if [[ "${livepatch}" != "NONE" ]]; then
echo \" KGRAFT=1 \\\\
KERNEL_VERSION=${livepatch} \\\\\"
fi
(
echo \" DISTRI=$distri \\\\
ARCH=$arch \\\\
Expand Down Expand Up @@ -583,6 +593,7 @@ def openqa_call_end(version):
echo " FLAVOR=${flavor//Tumbleweed-/} \\\\"
) | LANG=C.UTF-8 sort
echo ""
done
done
done
'''
Expand Down