From 12c2a8e144cdfd365bffa35a759caa93d917466d Mon Sep 17 00:00:00 2001 From: chungthuang Date: Tue, 14 Oct 2025 11:04:00 -0500 Subject: [PATCH] TUN-9916: Fix the cloudflared binary path used in the component test --- .ci/linux.gitlab-ci.yml | 2 +- .ci/windows.gitlab-ci.yml | 2 +- component-tests/test_management.py | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.ci/linux.gitlab-ci.yml b/.ci/linux.gitlab-ci.yml index d2b3e01b..3f57a42a 100644 --- a/.ci/linux.gitlab-ci.yml +++ b/.ci/linux.gitlab-ci.yml @@ -79,7 +79,7 @@ component-tests-linux: &component-tests-linux - ./.ci/scripts/component-tests.sh variables: &component-tests-variables CI: 1 - COMPONENT_TESTS_CONFIG_CONTENT: Y2xvdWRmbGFyZWRfYmluYXJ5OiBjbG91ZGZsYXJlZApjcmVkZW50aWFsc19maWxlOiBjcmVkLmpzb24Kb3JpZ2luY2VydDogY2VydC5wZW0Kem9uZV9kb21haW46IGFyZ290dW5uZWx0ZXN0LmNvbQp6b25lX3RhZzogNDg3OTZmMWU3MGJiNzY2OWMyOWJiNTFiYTI4MmJmNjU= + COMPONENT_TESTS_CONFIG_CONTENT: Y2xvdWRmbGFyZWRfYmluYXJ5OiAuL2Nsb3VkZmxhcmVkCmNyZWRlbnRpYWxzX2ZpbGU6IGNyZWQuanNvbgpvcmlnaW5jZXJ0OiBjZXJ0LnBlbQp6b25lX2RvbWFpbjogYXJnb3R1bm5lbHRlc3QuY29tCnpvbmVfdGFnOiA0ODc5NmYxZTcwYmI3NjY5YzI5YmI1MWJhMjgyYmY2NQ== tags: - linux-x86-8cpu-16gb artifacts: diff --git a/.ci/windows.gitlab-ci.yml b/.ci/windows.gitlab-ci.yml index fdc5ac0a..9a35edb6 100644 --- a/.ci/windows.gitlab-ci.yml +++ b/.ci/windows.gitlab-ci.yml @@ -36,7 +36,7 @@ load-windows-env-variables: # We have to encode the `COMPONENT_TESTS_ORIGINCERT` secret, because it content is a file, otherwise we can't export it using gitlab - echo "COMPONENT_TESTS_ORIGINCERT=$(echo "$COMPONENT_TESTS_ORIGINCERT" | base64 -w0)" >> windows.env variables: - COMPONENT_TESTS_CONFIG_CONTENT: Y2xvdWRmbGFyZWRfYmluYXJ5OiBjbG91ZGZsYXJlZC5leGUKY3JlZGVudGlhbHNfZmlsZTogY3JlZC5qc29uCm9yaWdpbmNlcnQ6IGNlcnQucGVtCnpvbmVfZG9tYWluOiBhcmdvdHVubmVsdGVzdC5jb20Kem9uZV90YWc6IDQ4Nzk2ZjFlNzBiYjc2NjljMjliYjUxYmEyODJiZjY1 + COMPONENT_TESTS_CONFIG_CONTENT: Y2xvdWRmbGFyZWRfYmluYXJ5OiAuL2Nsb3VkZmxhcmVkLmV4ZQpjcmVkZW50aWFsc19maWxlOiBjcmVkLmpzb24Kb3JpZ2luY2VydDogY2VydC5wZW0Kem9uZV9kb21haW46IGFyZ290dW5uZWx0ZXN0LmNvbQp6b25lX3RhZzogNDg3OTZmMWU3MGJiNzY2OWMyOWJiNTFiYTI4MmJmNjU= artifacts: access: 'none' reports: diff --git a/component-tests/test_management.py b/component-tests/test_management.py index cc6701fd..c9ae3d7e 100644 --- a/component-tests/test_management.py +++ b/component-tests/test_management.py @@ -107,7 +107,13 @@ class TestManagement: assert resp.status_code == 404, "Expected cloudflared to return 404 for /metrics" + + @retry(stop_max_attempt_number=MAX_RETRIES, wait_fixed=BACKOFF_SECS * 1000) def send_request(url, headers={}): with requests.Session() as s: - return s.get(url, timeout=BACKOFF_SECS, headers=headers) + resp = s.get(url, timeout=BACKOFF_SECS, headers=headers) + if resp.status_code == 530: + LOGGER.debug(f"Received 530 status, retrying request to {url}") + raise Exception(f"Received 530 status code from {url}") + return resp