ci(python): fix path to requirements.txt in release script (googleapis#659)

gcf-owl-bot[bot] · Mariatta · parthea · web-flow · commit 74baf78ecae8 · 2022-09-06T15:04:48.000-04:00
* ci(python): fix path to requirements.txt in release script Source-Link: googleapis/synthtool@fdba3ed Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:1f0dbd02745fb7cf255563dab5968345989308544e52b7f460deadd5e78e63b0 * Increase the timeouts. * increase timeout * increase timeout * increase timeouts * increase timeouts * increase timeouts * increase timeouts * increase timeouts * increase timeouts Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Mariatta Wijaya <mariattaw@google.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:60a63eddf86c87395b4bb394fdddfe30f84a7726ee8fe0b758ea132c2106ac75
-# created: 2022-08-24T19:47:37.288818056Z
+  digest: sha256:1f0dbd02745fb7cf255563dab5968345989308544e52b7f460deadd5e78e63b0
diff --git a/.kokoro/release.sh b/.kokoro/release.sh
@@ -16,7 +16,7 @@
 set -eo pipefail
 
 # Start the releasetool reporter
-python3 -m pip install --require-hashes -r .kokoro/requirements.txt
+python3 -m pip install --require-hashes -r github/python-bigtable/.kokoro/requirements.txt
 python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
 
 # Disable buffering, so that the logs stream through.
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
@@ -100,9 +100,9 @@ click==8.0.4 \
     # via
     #   gcp-docuploader
     #   gcp-releasetool
-colorlog==6.6.0 \
-    --hash=sha256:344f73204009e4c83c5b6beb00b3c45dc70fcdae3c80db919e0a4171d006fde8 \
-    --hash=sha256:351c51e866c86c3217f08e4b067a7974a678be78f07f85fc2d55b8babde6d94e
+colorlog==6.7.0 \
+    --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \
+    --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5
     # via
     #   gcp-docuploader
     #   nox
@@ -136,9 +136,9 @@ cryptography==37.0.4 \
     # via
     #   gcp-releasetool
     #   secretstorage
-distlib==0.3.5 \
-    --hash=sha256:a7f75737c70be3b25e2bee06288cec4e4c221de18455b2dd037fe2a795cab2fe \
-    --hash=sha256:b710088c59f06338ca514800ad795a132da19fda270e3ce4affc74abf955a26c
+distlib==0.3.6 \
+    --hash=sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46 \
+    --hash=sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e
     # via virtualenv
 docutils==0.19 \
     --hash=sha256:33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6 \
@@ -152,9 +152,9 @@ gcp-docuploader==0.6.3 \
     --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \
     --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b
     # via -r requirements.in
-gcp-releasetool==1.8.6 \
-    --hash=sha256:42e51ab8e2e789bc8e22a03c09352962cd3452951c801a2230d564816630304a \
-    --hash=sha256:a3518b79d1b243c494eac392a01c7fd65187fd6d52602dcab9b529bc934d4da1
+gcp-releasetool==1.8.7 \
+    --hash=sha256:3d2a67c9db39322194afb3b427e9cb0476ce8f2a04033695f0aeb63979fc2b37 \
+    --hash=sha256:5e4d28f66e90780d77f3ecf1e9155852b0c3b13cbccb08ab07e66b2357c8da8d
     # via -r requirements.in
 google-api-core==2.8.2 \
     --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \
@@ -251,9 +251,9 @@ jinja2==3.1.2 \
     --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \
     --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61
     # via gcp-releasetool
-keyring==23.8.2 \
-    --hash=sha256:0d9973f8891850f1ade5f26aafd06bb16865fbbae3fc56b0defb6a14a2624003 \
-    --hash=sha256:10d2a8639663fe2090705a00b8c47c687cacdf97598ea9c11456679fa974473a
+keyring==23.9.0 \
+    --hash=sha256:4c32a31174faaee48f43a7e2c7e9c3216ec5e95acf22a2bebfb4a1d05056ee44 \
+    --hash=sha256:98f060ec95ada2ab910c195a2d4317be6ef87936a766b239c46aa3c7aac4f0db
     # via
     #   gcp-releasetool
     #   twine
@@ -440,9 +440,9 @@ urllib3==1.26.12 \
     # via
     #   requests
     #   twine
-virtualenv==20.16.3 \
-    --hash=sha256:4193b7bc8a6cd23e4eb251ac64f29b4398ab2c233531e66e40b19a6b7b0d30c1 \
-    --hash=sha256:d86ea0bb50e06252d79e6c241507cb904fcd66090c3271381372d6221a3970f9
+virtualenv==20.16.4 \
+    --hash=sha256:014f766e4134d0008dcaa1f95bafa0fb0f575795d07cae50b1bee514185d6782 \
+    --hash=sha256:035ed57acce4ac35c82c9d8802202b0e71adac011a511ff650cbcf9635006a22
     # via nox
 webencodings==0.5.1 \
     --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \
diff --git a/noxfile.py b/noxfile.py
@@ -200,7 +200,9 @@ def unit(session):
 def install_systemtest_dependencies(session, *constraints):
 
     # Use pre-release gRPC for system tests.
-    session.install("--pre", "grpcio")
+    # Exclude version 1.49.0rc1 which has a known issue.
+    # See https://github.com/grpc/grpc/pull/30642
+    session.install("--pre", "grpcio!=1.49.0rc1")
 
     session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *constraints)
 
@@ -407,7 +409,8 @@ def prerelease_deps(session):
         # dependency of grpc
         "six",
         "googleapis-common-protos",
-        "grpcio",
+        # Exclude version 1.49.0rc1 which has a known issue. See https://github.com/grpc/grpc/pull/30642
+        "grpcio!=1.49.0rc1",
         "grpcio-status",
         "google-api-core",
         "proto-plus",
diff --git a/samples/instanceadmin/instanceadmin.py b/samples/instanceadmin/instanceadmin.py
@@ -74,7 +74,7 @@ def run_instance_operations(project_id, instance_id, cluster_id):
         # Create instance with given options
         operation = instance.create(clusters=[cluster])
         # Ensure the operation completes.
-        operation.result(timeout=60)
+        operation.result(timeout=240)
         print("\nCreated instance: {}".format(instance_id))
     # [END bigtable_create_prod_instance]
 
@@ -159,7 +159,7 @@ def add_cluster(project_id, instance_id, cluster_id):
         else:
             operation = cluster.create()
             # Ensure the operation completes.
-            operation.result(timeout=120)
+            operation.result(timeout=240)
             print("\nCluster created: {}".format(cluster_id))
         # [END bigtable_create_cluster]
 
diff --git a/samples/metricscaler/metricscaler_test.py b/samples/metricscaler/metricscaler_test.py
@@ -78,7 +78,7 @@ def instance():
             default_storage_type=storage_type,
         )
         operation = instance.create(clusters=[cluster])
-        response = operation.result(240)
+        response = operation.result(480)
         print(f"Successfully created {response.name}")
 
         # Eventual consistency check
diff --git a/tests/system/conftest.py b/tests/system/conftest.py
@@ -133,7 +133,7 @@ def admin_instance_populated(admin_instance, admin_cluster, in_emulator):
     # See: https://cloud.google.com/bigtable/docs/emulator
     if not in_emulator:
         operation = admin_instance.create(clusters=[admin_cluster])
-        operation.result(timeout=30)
+        operation.result(timeout=120)
 
     yield admin_instance
 
@@ -176,7 +176,7 @@ def data_instance_populated(
             serve_nodes=serve_nodes,
         )
         operation = instance.create(clusters=[cluster])
-        operation.result(timeout=30)
+        operation.result(timeout=120)
 
     yield instance
 
diff --git a/tests/system/test_instance_admin.py b/tests/system/test_instance_admin.py
@@ -84,7 +84,7 @@ def _modify_app_profile_helper(
     )
 
     operation = app_profile.update(ignore_warnings=ignore_warnings)
-    operation.result(timeout=60)
+    operation.result(timeout=120)
 
     alt_profile = instance.app_profile(app_profile_id)
     alt_profile.reload()
@@ -163,7 +163,7 @@ def test_instance_create_prod(
 
     operation = instance.create(clusters=[cluster])
     instances_to_delete.append(instance)
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
     assert instance.type_ is None
 
     # Create a new instance instance and make sure it is the same.
@@ -194,7 +194,7 @@ def test_instance_create_development(
 
     operation = instance.create(clusters=[cluster])
     instances_to_delete.append(instance)
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new instance instance and make sure it is the same.
     instance_alt = admin_client.instance(alt_instance_id)
@@ -244,7 +244,7 @@ def test_instance_create_w_two_clusters(
     )
     operation = instance.create(clusters=[cluster_1, cluster_2])
     instances_to_delete.append(instance)
-    operation.result(timeout=120)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new instance instance and make sure it is the same.
     instance_alt = admin_client.instance(alt_instance_id)
@@ -534,7 +534,7 @@ def test_instance_create_w_two_clusters_cmek(
     )
     operation = instance.create(clusters=[cluster_1, cluster_2])
     instances_to_delete.append(instance)
-    operation.result(timeout=120)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new instance instance and make sure it is the same.
     instance_alt = admin_client.instance(alt_instance_id)
@@ -597,7 +597,7 @@ def test_instance_update_display_name_and_labels(
     admin_instance_populated.labels = new_labels
 
     operation = admin_instance_populated.update()
-    operation.result(timeout=60)  # ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new instance instance and reload it.
     instance_alt = admin_client.instance(admin_instance_id, labels={})
@@ -614,7 +614,7 @@ def test_instance_update_display_name_and_labels(
     admin_instance_populated.display_name = old_display_name
     admin_instance_populated.labels = instance_labels
     operation = admin_instance_populated.update()
-    operation.result(timeout=60)  # ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
 
 def test_instance_update_w_type(
@@ -640,12 +640,12 @@ def test_instance_update_w_type(
 
     operation = instance.create(clusters=[cluster])
     instances_to_delete.append(instance)
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     instance.display_name = None
     instance.type_ = enums.Instance.Type.PRODUCTION
     operation = instance.update()
-    operation.result(timeout=60)  # ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new instance instance and reload it.
     instance_alt = admin_client.instance(alt_instance_id)
@@ -679,7 +679,7 @@ def test_cluster_create(
         default_storage_type=(enums.StorageType.SSD),
     )
     operation = cluster_2.create()
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new object instance, reload  and make sure it is the same.
     alt_cluster = admin_instance_populated.cluster(alt_cluster_id)
@@ -717,7 +717,7 @@ def test_cluster_create_w_autoscaling(
         default_storage_type=(enums.StorageType.SSD),
     )
     operation = cluster_2.create()
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new object instance, reload  and make sure it is the same.
     alt_cluster = admin_instance_populated.cluster(alt_cluster_id)
@@ -749,7 +749,7 @@ def test_cluster_update(
     admin_cluster.serve_nodes = new_serve_nodes
 
     operation = admin_cluster.update()
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new cluster instance and reload it.
     alt_cluster = admin_instance_populated.cluster(admin_cluster_id)
@@ -759,7 +759,7 @@ def test_cluster_update(
     # Put the cluster back the way it was for the other test cases.
     admin_cluster.serve_nodes = serve_nodes
     operation = admin_cluster.update()
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
 
 def test_cluster_update_w_autoscaling(
@@ -779,7 +779,7 @@ def test_cluster_update_w_autoscaling(
     admin_cluster_with_autoscaling.cpu_utilization_percent = new_cpu_utilization_percent
 
     operation = admin_cluster_with_autoscaling.update()
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new cluster instance and reload it.
     alt_cluster = admin_instance_populated.cluster(admin_cluster_id)
@@ -793,7 +793,7 @@ def test_cluster_update_w_autoscaling(
     admin_cluster_with_autoscaling.max_serve_nodes = max_serve_nodes
     admin_cluster_with_autoscaling.cpu_utilization_percent = cpu_utilization_percent
     operation = admin_cluster_with_autoscaling.update()
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
 
 def test_cluster_update_w_autoscaling_partial(
@@ -810,7 +810,7 @@ def test_cluster_update_w_autoscaling_partial(
     admin_cluster_with_autoscaling.min_serve_nodes = new_min_serve_nodes
 
     operation = admin_cluster_with_autoscaling.update()
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new cluster instance and reload it.
     alt_cluster = admin_instance_populated.cluster(admin_cluster_id)
@@ -827,7 +827,7 @@ def test_cluster_update_w_autoscaling_partial(
     admin_cluster_with_autoscaling.max_serve_nodes = max_serve_nodes
     admin_cluster_with_autoscaling.cpu_utilization_percent = cpu_utilization_percent
     operation = admin_cluster_with_autoscaling.update()
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
 
 def test_cluster_disable_autoscaling(
@@ -843,7 +843,7 @@ def test_cluster_disable_autoscaling(
     operation = admin_cluster_with_autoscaling.disable_autoscaling(
         serve_nodes=serve_nodes
     )
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
 
     # Create a new cluster instance and reload it.
     alt_cluster = admin_instance_populated.cluster(admin_cluster_id)
@@ -859,4 +859,4 @@ def test_cluster_disable_autoscaling(
     admin_cluster_with_autoscaling.cpu_utilization_percent = cpu_utilization_percent
     admin_cluster_with_autoscaling.serve_nodes = 0
     operation = admin_cluster_with_autoscaling.update()
-    operation.result(timeout=60)  # Ensure the operation completes.
+    operation.result(timeout=240)  # Ensure the operation completes.
diff --git a/tests/system/test_table_admin.py b/tests/system/test_table_admin.py
@@ -293,7 +293,7 @@ def test_table_backup(
 
     # Testing `Backup.create()` method
     backup_op = temp_backup.create()
-    backup_op.result(timeout=30)
+    backup_op.result(timeout=240)
 
     # Implicit testing of `Backup.delete()` method
     backups_to_delete.append(temp_backup)
@@ -346,11 +346,11 @@ def test_table_backup(
     )
     create_op = alt_instance.create(clusters=[alt_cluster])
     instances_to_delete.append(alt_instance)
-    create_op.result(timeout=30)
+    create_op.result(timeout=240)
 
     # Testing `restore()`...
     restore_op = temp_backup.restore(restored_table_id, alt_instance_id)
-    restore_op.result(timeout=30)
+    restore_op.result(timeout=240)
     restored_table = alt_instance.table(restored_table_id)
     assert restored_table in alt_instance.list_tables()
     restored_table.delete()

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ def instance():`
`78`	`78`	`default_storage_type=storage_type,`
`79`	`79`	`)`
`80`	`80`	`operation = instance.create(clusters=[cluster])`
`81`		`- response = operation.result(240)`
	`81`	`+ response = operation.result(480)`
`82`	`82`	`print(f"Successfully created {response.name}")`
`83`	`83`
`84`	`84`	`# Eventual consistency check`