fix(appengine): set project for bundled tests (#13165)

GoogleCloudPlatform · Feb 14, 2025 · 9990873 · 9990873
1 parent bb69110
commit 9990873
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 9 deletions.
diff --git a/appengine/standard_python3/bundled-services/blobstore/django/main_test.py b/appengine/standard_python3/bundled-services/blobstore/django/main_test.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import re
 import subprocess
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

diff --git a/appengine/standard_python3/bundled-services/blobstore/flask/main_test.py b/appengine/standard_python3/bundled-services/blobstore/flask/main_test.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import re
 import subprocess
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

diff --git a/appengine/standard_python3/bundled-services/blobstore/wsgi/main_test.py b/appengine/standard_python3/bundled-services/blobstore/wsgi/main_test.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import re
 import subprocess
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=5)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

diff --git a/appengine/standard_python3/bundled-services/deferred/django/main_test.py b/appengine/standard_python3/bundled-services/deferred/django/main_test.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import time
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

diff --git a/appengine/standard_python3/bundled-services/deferred/flask/main_test.py b/appengine/standard_python3/bundled-services/deferred/flask/main_test.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import time
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

diff --git a/appengine/standard_python3/bundled-services/deferred/wsgi/main_test.py b/appengine/standard_python3/bundled-services/deferred/wsgi/main_test.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import time
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

diff --git a/appengine/standard_python3/bundled-services/mail/django/main_test.py b/appengine/standard_python3/bundled-services/mail/django/main_test.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import time
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

diff --git a/appengine/standard_python3/bundled-services/mail/flask/main_test.py b/appengine/standard_python3/bundled-services/mail/flask/main_test.py
@@ -13,13 +13,16 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import uuid
 
 import backoff
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -36,7 +39,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

diff --git a/appengine/standard_python3/bundled-services/mail/wsgi/main_test.py b/appengine/standard_python3/bundled-services/mail/wsgi/main_test.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import time
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(