From b0a3349ddae921a046ef6763b86f4e72063913b3 Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Mon, 3 Nov 2025 06:37:57 +0000 Subject: [PATCH 01/12] test --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index a7db13a25..761c5f260 100644 --- a/README.rst +++ b/README.rst @@ -276,3 +276,4 @@ Next Steps .. _Google Cloud Storage Product documentation: https://cloud.google.com/storage .. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst +# test From 778e68ee4e565ec270f1972bda37700de228ccbf Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Mon, 3 Nov 2025 06:44:00 +0000 Subject: [PATCH 02/12] Revert "test" This reverts commit b0a3349ddae921a046ef6763b86f4e72063913b3. --- README.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/README.rst b/README.rst index 761c5f260..a7db13a25 100644 --- a/README.rst +++ b/README.rst @@ -276,4 +276,3 @@ Next Steps .. _Google Cloud Storage Product documentation: https://cloud.google.com/storage .. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst -# test From d3c3f29d93eb4d47714da4602fbb4ed990e9ca7a Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Wed, 3 Dec 2025 13:23:53 +0000 Subject: [PATCH 03/12] chore: debug conf test repeated timeout failures --- noxfile.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index 16cf97b01..597098c84 100644 --- a/noxfile.py +++ b/noxfile.py @@ -224,12 +224,11 @@ def conftest_retry(session): if session.posargs: test_cmd = [ "py.test", - "--quiet", conformance_test_folder_path, *session.posargs, ] else: - test_cmd = ["py.test", "-n", "auto", "--quiet", conformance_test_folder_path] + test_cmd = ["py.test", "-n", "auto", conformance_test_folder_path] # Run py.test against the conformance tests. session.run(*test_cmd) From 7d687b6c97ad20c4c7516a2ec07cbff86ae7aa9e Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Wed, 3 Dec 2025 18:02:25 +0000 Subject: [PATCH 04/12] reduce kokoro timeout to 15mins --- .kokoro/presubmit/common.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg index 51201dfab..60f5dbc5e 100644 --- a/.kokoro/presubmit/common.cfg +++ b/.kokoro/presubmit/common.cfg @@ -25,3 +25,5 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/python-storage/.kokoro/build.sh" } +# Reduce timeout to 15 only until b/465763979 is fixed +timeout_mins: 15 \ No newline at end of file From 16d804aa4d1f408890d00a41eb434ca4b2b8e2e2 Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Wed, 3 Dec 2025 18:17:42 +0000 Subject: [PATCH 05/12] add verbosity to pytest --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 597098c84..121cb993b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -228,7 +228,7 @@ def conftest_retry(session): *session.posargs, ] else: - test_cmd = ["py.test", "-n", "auto", conformance_test_folder_path] + test_cmd = ["py.test", "-v", "-s", "-n", "auto", conformance_test_folder_path] # Run py.test against the conformance tests. session.run(*test_cmd) From 644eccff81a7315dff46f28336f58492a580a715 Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Wed, 3 Dec 2025 18:47:12 +0000 Subject: [PATCH 06/12] pin docker version to 1.39 --- .kokoro/presubmit/common.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg index 60f5dbc5e..7e3a2f4a7 100644 --- a/.kokoro/presubmit/common.cfg +++ b/.kokoro/presubmit/common.cfg @@ -25,5 +25,10 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/python-storage/.kokoro/build.sh" } + +env_vars { + key: "DOCKER_API_VERSION" + value: "1.39" +} # Reduce timeout to 15 only until b/465763979 is fixed timeout_mins: 15 \ No newline at end of file From 81ceba95ebb54608ccb68c891be2c5c3348c19a8 Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Wed, 3 Dec 2025 18:56:50 +0000 Subject: [PATCH 07/12] pin docker api version to 1.39 in noxfile --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 121cb993b..d33e48447 100644 --- a/noxfile.py +++ b/noxfile.py @@ -231,7 +231,7 @@ def conftest_retry(session): test_cmd = ["py.test", "-v", "-s", "-n", "auto", conformance_test_folder_path] # Run py.test against the conformance tests. - session.run(*test_cmd) + session.run(*test_cmd, env={"DOCKER_API_VERSION": "1.39"}) @nox.session(python=DEFAULT_PYTHON_VERSION) From fcc5773de46b6fc61bbcbd5c7f3daa9846648209 Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Wed, 3 Dec 2025 19:12:14 +0000 Subject: [PATCH 08/12] remove env variable from common.cfg --- .kokoro/presubmit/common.cfg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg index 7e3a2f4a7..28ee3378e 100644 --- a/.kokoro/presubmit/common.cfg +++ b/.kokoro/presubmit/common.cfg @@ -26,9 +26,5 @@ env_vars: { value: "github/python-storage/.kokoro/build.sh" } -env_vars { - key: "DOCKER_API_VERSION" - value: "1.39" -} # Reduce timeout to 15 only until b/465763979 is fixed timeout_mins: 15 \ No newline at end of file From e3f39c76f2d79b7cdc3668f52238c9c64ddf3cdf Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Thu, 4 Dec 2025 17:22:11 +0000 Subject: [PATCH 09/12] undo changes in common.cfg --- .kokoro/presubmit/common.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg index 28ee3378e..51201dfab 100644 --- a/.kokoro/presubmit/common.cfg +++ b/.kokoro/presubmit/common.cfg @@ -25,6 +25,3 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/python-storage/.kokoro/build.sh" } - -# Reduce timeout to 15 only until b/465763979 is fixed -timeout_mins: 15 \ No newline at end of file From 1ec1f12fce1e29049176d2d95d7321c56ac59b9f Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Thu, 4 Dec 2025 17:24:03 +0000 Subject: [PATCH 10/12] undo changes in noxfile test_cmd --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index d33e48447..8a85d532e 100644 --- a/noxfile.py +++ b/noxfile.py @@ -228,7 +228,7 @@ def conftest_retry(session): *session.posargs, ] else: - test_cmd = ["py.test", "-v", "-s", "-n", "auto", conformance_test_folder_path] + test_cmd = ["py.test", "-n", "auto", conformance_test_folder_path] # Run py.test against the conformance tests. session.run(*test_cmd, env={"DOCKER_API_VERSION": "1.39"}) From dacdcc9b08d1dd61815e80cf773eca80a2e0da49 Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Thu, 4 Dec 2025 17:25:58 +0000 Subject: [PATCH 11/12] add --quiet flag back --- noxfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 8a85d532e..b89b9d319 100644 --- a/noxfile.py +++ b/noxfile.py @@ -224,11 +224,12 @@ def conftest_retry(session): if session.posargs: test_cmd = [ "py.test", + "--quiet", conformance_test_folder_path, *session.posargs, ] else: - test_cmd = ["py.test", "-n", "auto", conformance_test_folder_path] + test_cmd = ["py.test", "-n", "auto", "--quiet", conformance_test_folder_path] # Run py.test against the conformance tests. session.run(*test_cmd, env={"DOCKER_API_VERSION": "1.39"}) From 0daab4e55648edb9626cd6c3fae087c6caf41854 Mon Sep 17 00:00:00 2001 From: Chandra Sirimala Date: Thu, 4 Dec 2025 17:48:58 +0000 Subject: [PATCH 12/12] Trigger checks