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

Retry all pagure.io downloads

Browse Source 
This tweaks all pagure.io downloads to be retried a few times,
since we seem to be getting failures quite often. We use curl
for this as it has nice options for it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-07-19 12:51:31 -07:00
parent daf092398a
commit d5a9e4777e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/utils.pm
View File

@ -916,9 +916,9 @@ sub download_modularity_tests {
my ($whitelist) = @_; my ($whitelist) = @_;
# we need python3-yaml for the script to run # we need python3-yaml for the script to run
assert_script_run 'dnf -y install python3-yaml', 180; assert_script_run 'dnf -y install python3-yaml', 180;
assert_script_run 'curl -o /root/test.py https://pagure.io/fedora-qa/modularity_testing_scripts/raw/master/f/modular_functions.py'; assert_script_run 'curl --retry-delay 10 --max-time 30 --retry 5 -o /root/test.py https://pagure.io/fedora-qa/modularity_testing_scripts/raw/master/f/modular_functions.py', timeout => 180;
if ($whitelist eq 'whitelist') { if ($whitelist eq 'whitelist') {
assert_script_run 'curl -o /root/whitelist https://pagure.io/fedora-qa/modularity_testing_scripts/raw/master/f/whitelist'; assert_script_run 'curl --retry-delay 10 --max-time 30 --retry 5 -o /root/whitelist https://pagure.io/fedora-qa/modularity_testing_scripts/raw/master/f/whitelist', timeout => 180;
} }
assert_script_run 'chmod 755 /root/test.py'; assert_script_run 'chmod 755 /root/test.py';
} }
@ -1080,7 +1080,7 @@ sub advisory_check_nonmatching_packages {
upload_logs "/tmp/installedupdatepkgs.txt", failok => 1; upload_logs "/tmp/installedupdatepkgs.txt", failok => 1;
upload_logs "/mnt/updateiso/updatepkgs.txt", failok => 1; upload_logs "/mnt/updateiso/updatepkgs.txt", failok => 1;
# download the check script and run it # download the check script and run it
assert_script_run 'curl -o updvercheck.py https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/main/f/updvercheck.py', timeout => 120; assert_script_run 'curl --retry-delay 10 --max-time 30 --retry 5 -o updvercheck.py https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/main/f/updvercheck.py', timeout => 180;
my $advisory = get_var("ADVISORY"); my $advisory = get_var("ADVISORY");
my $cmd = 'python3 ./updvercheck.py /mnt/updateiso/updatepkgs.txt /tmp/installedupdatepkgs.txt'; my $cmd = 'python3 ./updvercheck.py /mnt/updateiso/updatepkgs.txt /tmp/installedupdatepkgs.txt';
$cmd .= " $advisory" if ($advisory); $cmd .= " $advisory" if ($advisory);
@ -1462,7 +1462,7 @@ sub download_testdata {
assert_script_run("mkdir temp"); assert_script_run("mkdir temp");
assert_script_run("cd temp"); assert_script_run("cd temp");
# Download the compressed file with the repository content. # Download the compressed file with the repository content.
assert_script_run("wget https://pagure.io/fedora-qa/openqa_testdata/blob/thetree/f/repository.tar.gz", timeout => 120); assert_script_run("curl --retry-delay 10 --max-time 120 --retry 5 -o repository.tar.gz https://pagure.io/fedora-qa/openqa_testdata/blob/thetree/f/repository.tar.gz", timeout => 600);
# Untar it. # Untar it.
assert_script_run("tar -zxvf repository.tar.gz"); assert_script_run("tar -zxvf repository.tar.gz");
# Copy out the files into the VMs directory structure. # Copy out the files into the VMs directory structure.

4
tests/_ostree_build.pm
View File

@ -35,7 +35,7 @@ sub run {
# usually a good idea for this kinda thing # usually a good idea for this kinda thing
assert_script_run "setenforce Permissive"; assert_script_run "setenforce Permissive";
# install the tools we need # install the tools we need
assert_script_run "dnf -y install git lorax flatpak ostree rpm-ostree wget dbus-daemon moreutils", 300; assert_script_run "dnf -y install git lorax flatpak ostree rpm-ostree dbus-daemon moreutils", 300;
# now check out workstation-ostree-config # now check out workstation-ostree-config
assert_script_run 'git clone https://pagure.io/workstation-ostree-config.git'; assert_script_run 'git clone https://pagure.io/workstation-ostree-config.git';
assert_script_run 'pushd workstation-ostree-config'; assert_script_run 'pushd workstation-ostree-config';
@ -83,7 +83,7 @@ sub run {
assert_script_run 'git clone https://pagure.io/pungi-fedora.git'; assert_script_run 'git clone https://pagure.io/pungi-fedora.git';
assert_script_run 'cd pungi-fedora/'; assert_script_run 'cd pungi-fedora/';
assert_script_run "git checkout ${branch}"; assert_script_run "git checkout ${branch}";
assert_script_run 'wget https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/main/f/ostree-parse-pungi.py', timeout => 120; assert_script_run 'curl --retry-delay 10 --max-time 30 --retry 5 -o ostree-parse-pungi.py https://pagure.io/fedora-qa/os-autoinst-distri-fedora/raw/main/f/ostree-parse-pungi.py', timeout => 180;
my $loraxargs = script_output "python3 ostree-parse-pungi.py $lcsubv $arch"; my $loraxargs = script_output "python3 ostree-parse-pungi.py $lcsubv $arch";
# this 'temporary file cleanup' thing can actually wipe bits of # this 'temporary file cleanup' thing can actually wipe bits of

2
tests/mediakit_fileconflicts.pm
View File

@ -9,7 +9,7 @@ sub run {
# mount the ISO there # mount the ISO there
assert_script_run "mount /dev/cdrom /mnt/iso"; assert_script_run "mount /dev/cdrom /mnt/iso";
# download the check script # download the check script
assert_script_run "curl -o /usr/local/bin/potential_conflict.py https://pagure.io/fedora-qa/qa-misc/raw/master/f/potential_conflict.py"; assert_script_run "curl --retry-delay 10 --max-time 30 --retry 5 -o /usr/local/bin/potential_conflict.py https://pagure.io/fedora-qa/qa-misc/raw/master/f/potential_conflict.py", timeout => 180;
# run the check # run the check
assert_script_run "python3 /usr/local/bin/potential_conflict.py --repofrompath=media,/mnt/iso -r media"; assert_script_run "python3 /usr/local/bin/potential_conflict.py --repofrompath=media,/mnt/iso -r media";
} }