From 91bf4e423fc95ed6206728e3e584d5c2277ae622 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 10 Aug 2023 15:13:04 -0700 Subject: [PATCH] Disable forced use of HTTP 1.1 for curl and git To see if the bug has gone away now - https://pagure.io/fedora-infrastructure/issue/11426#comment-867456 Signed-off-by: Adam Williamson --- lib/utils.pm | 8 ++++---- tests/_live_build.pm | 4 ---- tests/_ostree_build.pm | 6 +----- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index de0b63f6..5bb599f9 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -949,9 +949,9 @@ sub download_modularity_tests { my ($whitelist) = @_; # we need python3-yaml for the script to run assert_script_run 'dnf -y install python3-yaml', 180; - assert_script_run 'curl --http1.1 --verbose --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; + assert_script_run 'curl --verbose --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') { - assert_script_run 'curl --http1.1 --verbose --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 'curl --verbose --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'; } @@ -1113,7 +1113,7 @@ sub advisory_check_nonmatching_packages { upload_logs "/tmp/installedupdatepkgs.txt", failok => 1; upload_logs "/mnt/updateiso/updatepkgs.txt", failok => 1; # download the check script and run it - assert_script_run 'curl --http1.1 --verbose --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; + assert_script_run 'curl --verbose --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 $cmd = 'python3 ./updvercheck.py /mnt/updateiso/updatepkgs.txt /tmp/installedupdatepkgs.txt'; $cmd .= " $advisory" if ($advisory); @@ -1495,7 +1495,7 @@ sub download_testdata { assert_script_run("mkdir temp"); assert_script_run("cd temp"); # Download the compressed file with the repository content. - assert_script_run("curl --http1.1 --verbose --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); + assert_script_run("curl --verbose --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. assert_script_run("tar -zxvf repository.tar.gz"); # Copy out the files into the VMs directory structure. diff --git a/tests/_live_build.pm b/tests/_live_build.pm index 0f05f5f5..babe2d7a 100644 --- a/tests/_live_build.pm +++ b/tests/_live_build.pm @@ -67,10 +67,6 @@ sub run { # upload the config so we can check it's OK upload_logs "/etc/mock/openqa.cfg"; # now check out the kickstarts - # FIXME using HTTP 1.1 seems to avoid some weird hangs we're - # seeing on pagure.io lately as of 2023/07: - # https://pagure.io/fedora-infrastructure/issue/11426 - assert_script_run 'git config --global http.version HTTP/1.1'; assert_script_run 'git clone https://pagure.io/fedora-kickstarts.git'; assert_script_run 'cd fedora-kickstarts'; assert_script_run "git checkout ${branch}"; diff --git a/tests/_ostree_build.pm b/tests/_ostree_build.pm index f291928d..4991d9a0 100644 --- a/tests/_ostree_build.pm +++ b/tests/_ostree_build.pm @@ -36,10 +36,6 @@ sub run { assert_script_run "setenforce Permissive"; # install the tools we need assert_script_run "dnf -y install git lorax flatpak ostree rpm-ostree dbus-daemon moreutils", 300; - # FIXME using HTTP 1.1 seems to avoid some weird hangs we're - # seeing on pagure.io lately as of 2023/07: - # https://pagure.io/fedora-infrastructure/issue/11426 - assert_script_run 'git config --global http.version HTTP/1.1'; # now check out workstation-ostree-config assert_script_run 'git clone https://pagure.io/workstation-ostree-config.git'; assert_script_run 'pushd workstation-ostree-config'; @@ -89,7 +85,7 @@ sub run { assert_script_run 'git clone https://pagure.io/pungi-fedora.git'; assert_script_run 'cd pungi-fedora/'; assert_script_run "git checkout ${branch}"; - assert_script_run 'curl --http1.1 --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; + 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"; # this 'temporary file cleanup' thing can actually wipe bits of