Compare commits
5 Commits
63073b8232
...
fc1089de0e
Author | SHA1 | Date |
---|---|---|
Adam Williamson | fc1089de0e | |
Adam Williamson | d65aac4c83 | |
Adam Williamson | f9cda76860 | |
Adam Williamson | 5a548fd3c7 | |
Adam Williamson | b976fb2d58 |
10
lib/utils.pm
10
lib/utils.pm
|
@ -476,7 +476,7 @@ sub get_workarounds {
|
|||
my %workarounds = (
|
||||
"38" => [],
|
||||
"39" => [],
|
||||
"40" => ["FEDORA-2024-b156c57ef1"],
|
||||
"40" => [],
|
||||
"41" => [],
|
||||
);
|
||||
my $advortasks = $workarounds{$version};
|
||||
|
@ -1230,6 +1230,7 @@ sub advisory_check_nonmatching_packages {
|
|||
# older version from the frozen release repo
|
||||
my %args = (
|
||||
fatal => 1,
|
||||
wrapper => "",
|
||||
@_
|
||||
);
|
||||
# can't do anything useful when testing a side tag
|
||||
|
@ -1241,6 +1242,9 @@ sub advisory_check_nonmatching_packages {
|
|||
# unnecessarily in post_fail_hook
|
||||
return if (get_var("_ACNMP_DONE"));
|
||||
script_run 'touch /tmp/installedupdatepkgs.txt';
|
||||
my $rpmcmd = "rpm";
|
||||
my $wrapper = $args{wrapper};
|
||||
$rpmcmd = "$wrapper rpm" if ($wrapper);
|
||||
# this creates /tmp/installedupdatepkgs.txt as a sorted list of installed
|
||||
# packages with the same name as packages from the update, in the same form
|
||||
# as /mnt/updatepkgs.txt. The '--last | head -1' tries to handle the
|
||||
|
@ -1254,7 +1258,7 @@ sub advisory_check_nonmatching_packages {
|
|||
# (we need four to reach bash, and half of them get eaten by perl or
|
||||
# something along the way). Yes, it only works with *single* quotes. Yes,
|
||||
# I hate escaping
|
||||
script_run 'for pkg in $(cat /mnt/updatepkgnames.txt); do rpm -q $pkg && rpm -q $pkg --last | head -1 | cut -d" " -f1 | sed -e \'s,\^,\\\\\\\\^,g\' | xargs rpm -q --qf "%{SOURCERPM} %{NAME} %{EPOCHNUM} %{VERSION} %{RELEASE}\n" >> /tmp/installedupdatepkgs.txt; done', timeout => 180;
|
||||
script_run 'for pkg in $(cat /mnt/updatepkgnames.txt); do ' . $rpmcmd . ' -q $pkg && ' . $rpmcmd . ' -q $pkg --last | head -1 | cut -d" " -f1 | sed -e \'s,\^,\\\\\\\\^,g\' | xargs rpm -q --qf "%{SOURCERPM} %{NAME} %{EPOCHNUM} %{VERSION} %{RELEASE}\n" >> /tmp/installedupdatepkgs.txt; done', timeout => 180;
|
||||
script_run 'sort -u -o /tmp/installedupdatepkgs.txt /tmp/installedupdatepkgs.txt';
|
||||
# for debugging, may as well always upload these, can't hurt anything
|
||||
upload_logs "/tmp/installedupdatepkgs.txt", failok => 1;
|
||||
|
@ -1274,7 +1278,7 @@ sub advisory_check_nonmatching_packages {
|
|||
my $message = "Package(s) from update not installed when it should have been! See script output";
|
||||
$message = "Script failed unexpectedly!" if ($ret == 1);
|
||||
if ($args{fatal}) {
|
||||
set_var("_ACNMP_DONE", "1");
|
||||
set_var("_ACNMP_DONE", "1") unless $wrapper;
|
||||
die $message;
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"width": 90,
|
||||
"xpos": 467,
|
||||
"ypos": 286,
|
||||
"type": "match",
|
||||
"height": 104
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"panel_screen_locked"
|
||||
]
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 233 KiB |
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"area": [
|
||||
{
|
||||
"height": 18,
|
||||
"type": "match",
|
||||
"ypos": 728,
|
||||
"width": 17,
|
||||
"xpos": 880
|
||||
}
|
||||
],
|
||||
"properties": [],
|
||||
"tags": [
|
||||
"DESKTOP-kde",
|
||||
"desktop_expand_systray"
|
||||
]
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
|
@ -335,6 +335,21 @@
|
|||
"fedora-updates-workstation-x86_64-*-64bit": 5
|
||||
}
|
||||
},
|
||||
"container_build_kiwi": {
|
||||
"profiles": {
|
||||
"fedora-updates-container-x86_64-*-64bit": 5
|
||||
},
|
||||
"settings": {
|
||||
"BOOTFROM": "c",
|
||||
"HDD_1": "disk_f%VERSION%_minimal_4_%ARCH%.qcow2",
|
||||
"HDDSIZEGB_3": "25",
|
||||
"MAX_JOB_TIME": "10800",
|
||||
"+NUMDISKS": "3",
|
||||
"POSTINSTALL": "_container_build_kiwi",
|
||||
"ROOT_PASSWORD": "weakpassword",
|
||||
"USER_LOGIN": "false"
|
||||
}
|
||||
},
|
||||
"desktop_background": {
|
||||
"profiles": {
|
||||
"fedora-updates-kde-x86_64-*-64bit": 5,
|
||||
|
|
|
@ -0,0 +1,124 @@
|
|||
use base "installedtest";
|
||||
use strict;
|
||||
use testapi;
|
||||
use utils;
|
||||
|
||||
sub run {
|
||||
my $self = shift;
|
||||
my $version = get_var("VERSION");
|
||||
# we didn't use kiwi before F40, and I don't really want to write
|
||||
# an imgfac test for a release that will be dead in 6 months
|
||||
# FIXME drop when F39 is EOL
|
||||
if ($version < 40) {
|
||||
record_info('notvalid', "this test cannot be run on Fedora < 40");
|
||||
return;
|
||||
}
|
||||
my $rawrel = get_var("RAWREL");
|
||||
my $branch;
|
||||
my $repoxml;
|
||||
my $releasever;
|
||||
my $mockver;
|
||||
if ($version eq $rawrel) {
|
||||
$branch = "main";
|
||||
$repoxml = "repositories/core-rawhide.xml";
|
||||
$releasever = "Rawhide";
|
||||
$mockver = "rawhide";
|
||||
}
|
||||
else {
|
||||
$branch = "f${version}";
|
||||
$repoxml = "repositories/core-nonrawhide.xml";
|
||||
$releasever = $version;
|
||||
$mockver = $version;
|
||||
}
|
||||
my $arch = get_var("ARCH");
|
||||
my $tag = get_var("TAG");
|
||||
my $workarounds = get_workarounds;
|
||||
if (get_var("NUMDISKS") > 2) {
|
||||
# put /var/lib/mock on the third disk, so we don't run out of
|
||||
# space on the main disk. The second disk will have already
|
||||
# been claimed for the update repo.
|
||||
assert_script_run "echo 'type=83' | sfdisk /dev/vdc";
|
||||
assert_script_run "mkfs.ext4 /dev/vdc1";
|
||||
assert_script_run "echo '/dev/vdc1 /var/lib/mock ext4 defaults 1 2' >> /etc/fstab";
|
||||
assert_script_run "mkdir -p /var/lib/mock";
|
||||
assert_script_run "mount /var/lib/mock";
|
||||
}
|
||||
# install the tools we need
|
||||
assert_script_run "dnf -y install mock git", 300;
|
||||
# base mock config on original
|
||||
assert_script_run "echo \"include('/etc/mock/fedora-${mockver}-${arch}.cfg')\" > /etc/mock/openqa.cfg";
|
||||
# make the side and workarounds repos and the serial device available inside the mock root
|
||||
assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_enable\'] = True" >> /etc/mock/openqa.cfg';
|
||||
assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_opts\'][\'dirs\'].append((\'/mnt/update_repo\', \'/mnt/update_repo\'))" >> /etc/mock/openqa.cfg' unless ($tag);
|
||||
assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_opts\'][\'dirs\'].append((\'/mnt/workarounds_repo\', \'/mnt/workarounds_repo\'))" >> /etc/mock/openqa.cfg' if ($workarounds);
|
||||
assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_opts\'][\'dirs\'].append((\'/dev/' . $serialdev . '\', \'/dev/' . $serialdev . '\'))" >> /etc/mock/openqa.cfg';
|
||||
my $repos = 'config_opts[\'dnf.conf\'] += \"\"\"\n';
|
||||
# add the update repo or tag repo to the config
|
||||
$repos .= '[advisory]\nname=Advisory repo\nbaseurl=file:///mnt/update_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n' unless ($tag);
|
||||
$repos .= '[openqa-testtag]\nname=Tag test repo\nbaseurl=https://kojipkgs.fedoraproject.org/repos/' . "${tag}/latest/${arch}" . '\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n' if ($tag);
|
||||
# and the workaround repo
|
||||
$repos .= '\n[workarounds]\nname=Workarounds repo\nbaseurl=file:///mnt/workarounds_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n' if ($workarounds);
|
||||
# also the buildroot repo, for Rawhide
|
||||
if ($version eq $rawrel) {
|
||||
$repos .= '\n[koji-rawhide]\nname=Buildroot repo\nbaseurl=https://kojipkgs.fedoraproject.org/repos/f' . $version . '-build/latest/\$basearch/\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\nskip_if_unavailable=1\n';
|
||||
}
|
||||
$repos .= '\"\"\"';
|
||||
assert_script_run 'printf "' . $repos . '" >> /etc/mock/openqa.cfg';
|
||||
# replace metalink with mirrorlist so we don't get slow mirrors
|
||||
repos_mirrorlist "/etc/mock/templates/*.tpl";
|
||||
# upload the config so we can check it's OK
|
||||
upload_logs "/etc/mock/openqa.cfg";
|
||||
# now check out the fedora kiwi descriptions
|
||||
assert_script_run 'git clone https://pagure.io/fedora-kiwi-descriptions.git';
|
||||
assert_script_run 'cd fedora-kiwi-descriptions';
|
||||
assert_script_run "git checkout ${branch}";
|
||||
# correct the GPG key paths in the repositories and swap metalink
|
||||
# to mirrorlist
|
||||
assert_script_run 'sed -i -e "s,/usr/share/distribution-gpg-keys/fedora,/etc/pki/rpm-gpg,g" ' . $repoxml;
|
||||
repos_mirrorlist $repoxml;
|
||||
# now add the side repo or tag repo to the appropriate repo XML
|
||||
assert_script_run 'printf "$(head -n -1 ' . $repoxml . ')\n <repository type=\"rpm-md\" alias=\"advisory\" sourcetype=\"baseurl\">\n <source path=\"file:///mnt/update_repo\"/>\n </repository>\n</image>\n" > ' . $repoxml unless ($tag);
|
||||
assert_script_run 'printf "$(head -n -1 ' . $repoxml . ')\n <repository type=\"rpm-md\" alias=\"openqa-testtag\" sourcetype=\"baseurl\">\n <source path=\"https://kojipkgs.fedoraproject.org/repos/' . "${tag}/latest/${arch}" . '\"/>\n </repository>\n</image>\n" > ' . $repoxml if ($tag);
|
||||
# and the workarounds repo
|
||||
assert_script_run 'printf "$(head -n -1 ' . $repoxml . ')\n <repository type=\"rpm-md\" alias=\"workarounds\" sourcetype=\"baseurl\">\n <source path=\"file:///mnt/workarounds_repo\"/>\n </repository>\n</image>\n" > ' . $repoxml if ($workarounds);
|
||||
# and the buildroot repo, for Rawhide
|
||||
assert_script_run 'printf "$(head -n -1 ' . $repoxml . ')\n <repository type=\"rpm-md\" alias=\"koji-rawhide\" sourcetype=\"baseurl\">\n <source path=\"https://kojipkgs.fedoraproject.org/repos/f' . $version . '-build/latest/\$basearch/\"/>\n </repository>\n</image>\n" > ' . $repoxml if ($version eq $rawrel);
|
||||
# upload the repositories XML so we can check it
|
||||
# NOTE: koji kiwi plugin does much more futzing around with the XML
|
||||
# it flattens includes, fiddles with the repos, and and messes with
|
||||
# preferences a bit. see
|
||||
# KiwiCreateImageTask.prepareDescription. but we do our own repo
|
||||
# stuff above, the preference stuff is unnecessary on Fedora, and
|
||||
# the flattening is unnecessary outside Koji
|
||||
upload_logs "$repoxml";
|
||||
assert_script_run "cd ..";
|
||||
# now install the tools into the mock
|
||||
assert_script_run "mock -r openqa --install kiwi-cli kiwi-systemdeps", 900;
|
||||
# now copy the descriptions in
|
||||
assert_script_run "mock -r openqa --isolation=simple --copyin fedora-kiwi-descriptions /fedora-kiwi-descriptions";
|
||||
# PULL SOME LEVERS! PULL SOME LEVERS!
|
||||
assert_script_run "mock -r openqa --enable-network --chroot \"kiwi-ng --profile Container-Base-Generic --debug --logfile /tmp/image-root.log system build --description /fedora-kiwi-descriptions/ --target-dir /builddir/result/image\"", 7200;
|
||||
unless (script_run "mock -r openqa --isolation=simple --copyout /tmp/image-root.log .", 90) {
|
||||
upload_logs "image-root.log";
|
||||
}
|
||||
assert_script_run "mock -r openqa --isolation=simple --copyout /builddir/result/image/Fedora.${arch}-${releasever}.oci.tar.xz .", 180;
|
||||
upload_asset "./Fedora.${arch}-${releasever}.oci.tar.xz";
|
||||
|
||||
# load and test that we can use the built container
|
||||
assert_script_run "podman load -i ./Fedora.${arch}-${releasever}.oci.tar.xz";
|
||||
my $imgspec = "localhost/fedora:${mockver}";
|
||||
validate_script_output "podman run -it ${imgspec} echo Hello-World", sub { m/Hello-World/ };
|
||||
# do advisory_check_nonmatching_packages inside the container
|
||||
advisory_check_nonmatching_packages(wrapper => "podman run -it ${imgspec}");
|
||||
# wipe the temp file so it doesn't interfere with the same check
|
||||
# on the host
|
||||
assert_script_run "rm -f /tmp/installedupdatepkgs.txt";
|
||||
}
|
||||
|
||||
sub test_flags {
|
||||
return {fatal => 1};
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
# vim: set sw=4 et:
|
|
@ -16,10 +16,7 @@ sub run {
|
|||
my $relnum = get_release_number;
|
||||
unless (get_var("CANNED")) {
|
||||
# run the upstream integration tests
|
||||
# FIXME composefs seems to be a hard dep since containers-common-0.58.0-10.fc41
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2275820
|
||||
# drop it if that gets fixed
|
||||
assert_script_run "dnf -y install podman podman-tests bats composefs", 300;
|
||||
assert_script_run "dnf -y install podman podman-tests bats", 300;
|
||||
assert_script_run "bats --filter-tags distro-integration /usr/share/podman/test/system", 600;
|
||||
}
|
||||
# check to see if you can pull an image from the registry
|
||||
|
|
|
@ -8,10 +8,7 @@ sub run {
|
|||
my $self = shift;
|
||||
$self->root_console(tty => 3);
|
||||
# on non-canned flavors, we need to install toolbox
|
||||
# FIXME composefs seems to be a hard dep since containers-common-0.58.0-10.fc41
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2275820
|
||||
# drop it if that gets fixed
|
||||
assert_script_run "dnf -y install toolbox composefs", 360 unless (get_var("CANNED"));
|
||||
assert_script_run "dnf -y install toolbox", 360 unless (get_var("CANNED"));
|
||||
# check toolbox is installed
|
||||
assert_script_run "rpm -q toolbox";
|
||||
# check to see if you can create a new toolbox container (this
|
||||
|
|
Loading…
Reference in New Issue