From ce506efc5a8580014f561a5531ff9190c39063c0 Mon Sep 17 00:00:00 2001 From: Michael Boquard Date: Tue, 26 Mar 2024 19:37:05 -0400 Subject: [PATCH 1/2] rptest: Made curl command backwards compatible Made curl command in redpanda_installer compatible with older versions of curl. Signed-off-by: Michael Boquard (cherry picked from commit 63fe4ef00286c25a3cccb82f699811fc4406f5fe) --- tests/rptest/services/redpanda_installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/rptest/services/redpanda_installer.py b/tests/rptest/services/redpanda_installer.py index c954a7f10706c..359c00771ab00 100644 --- a/tests/rptest/services/redpanda_installer.py +++ b/tests/rptest/services/redpanda_installer.py @@ -677,7 +677,7 @@ def _async_download_on_node_unlocked(self, node, version): version_root = self.root_for_version(version) tgz = "redpanda.tar.gz" - cmd = f"curl -fsSL {self._version_package_url(version)} --create-dir --output-dir {version_root} -o {tgz} && gunzip -c {version_root}/{tgz} | tar -xf - -C {version_root} && rm {version_root}/{tgz}" + cmd = f"curl -fsSL {self._version_package_url(version)} --create-dir -o {version_root}/{tgz} && gunzip -c {version_root}/{tgz} | tar -xf - -C {version_root} && rm {version_root}/{tgz}" return node.account.ssh_capture(cmd) def reset_current_install(self, nodes): From b467d8ad59dee6e4302456a3f8a5c85612175193 Mon Sep 17 00:00:00 2001 From: Jackie Tung Date: Thu, 9 May 2024 16:38:23 -0700 Subject: [PATCH 2/2] [dt] add retries to remote curl call (cherry picked from commit f236b110b357f8317a2920c0630178e9fa6ff420) --- tests/rptest/services/redpanda_installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/rptest/services/redpanda_installer.py b/tests/rptest/services/redpanda_installer.py index 359c00771ab00..4d78f847aca4f 100644 --- a/tests/rptest/services/redpanda_installer.py +++ b/tests/rptest/services/redpanda_installer.py @@ -677,7 +677,7 @@ def _async_download_on_node_unlocked(self, node, version): version_root = self.root_for_version(version) tgz = "redpanda.tar.gz" - cmd = f"curl -fsSL {self._version_package_url(version)} --create-dir -o {version_root}/{tgz} && gunzip -c {version_root}/{tgz} | tar -xf - -C {version_root} && rm {version_root}/{tgz}" + cmd = f"curl -fsSL {self._version_package_url(version)} --retry 3 --retry-connrefused --retry-delay 2 --create-dir -o {version_root}/{tgz} && gunzip -c {version_root}/{tgz} | tar -xf - -C {version_root} && rm {version_root}/{tgz}" return node.account.ssh_capture(cmd) def reset_current_install(self, nodes):