changed the filename

also simplified the config
stop runnint `gcloud update`
add a warning about editing noxfile.py

Author: Takashi Matsuo

test_config.py renamed to monitoring/api/v3/alerts-client/noxfile_config.py

@@ -18,7 +18,7 @@
 # the noxfile.py.
 
 # The source of truth:
-# https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/test_config.py
+# https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/noxfile_config.py
 
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
@@ -33,17 +33,11 @@
     # names for your e2e test.
     'cloud_run_e2e_test_files': ['e2e_test.py'],
 
-    # If set to True, the test will install the library from the root
-    # of the repository.
-    'install_library_from_source': False,
-
-    # Set to True if you want to use the Cloud Project configured for each
-    # build.
-    'use_build_specific_project': False,
-
-    # An envvar key for determining the build specific project. Normally you
-    # don't have to modify this.
-    'build_specific_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT_ENV',
+    # An envvar key for determining the project id to use. Change it
+    # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using
+    # a build specific Cloud project.
+    # 'gcloud_project_env': 'GCLOUD_PROJECT',
+    'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
 
     # A dictionary you want to inject into your test. Don't put any
     # secrets here. These values will override predefined values.

noxfile-template.py

@@ -19,11 +19,19 @@
 
 import nox
 
+# WARNING - WARNING - WARNING - WARNING - WARNING
+# WARNING - WARNING - WARNING - WARNING - WARNING
+#           DO NOT EDIT THIS FILE EVER!
+# WARNING - WARNING - WARNING - WARNING - WARNING
+# WARNING - WARNING - WARNING - WARNING - WARNING
+
+# Copy `noxfile_config.py` to your directory and modify it instead.
+
 
 # `TEST_CONFIG` dict is a configuration hook that allows users to
 # modify the test configurations. The values here should be in sync
-# with `test_config.py`. Users will copy `test_config.py` into their
-# directory and modify it.
+# with `noxfile_config.py`. Users will copy `noxfile_config.py` into
+# their directory and modify it.
 
 TEST_CONFIG = {
     # You can opt out from the test for specific Python versions.
@@ -38,42 +46,35 @@
     # names for your e2e test.
     'cloud_run_e2e_test_files': ['e2e_test.py'],
 
-    # If set to True, the test will install the library from the root
-    # of the repository.
-    'install_library_from_source': False,
-
-    # Set to True if you want to use the Cloud Project configured for each
-    # build.
-    'use_build_specific_project': False,
-
-    # An envvar key for determining the build specific project. Normally you
-    # don't have to modify this.
-    'build_specific_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
+    # An envvar key for determining the project id to use. Change it
+    # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using
+    # a build specific Cloud project.
+    'gcloud_project_env': 'GCLOUD_PROJECT',
+    # 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
 
     # A dictionary you want to inject into your test. Don't put any
     # secrets here. These values will override predefined values.
     'envs': {},
 }
 
 try:
-    from test_config import TEST_CONFIG_OVERRIDE
+    from noxfile_config import TEST_CONFIG_OVERRIDE
 except ImportError:
     TEST_CONFIG_OVERRIDE = {}
 
-# Update the TEST_CONFIG with user supplied values.
+# Update the TEST_CONFIG with the user supplied values.
 TEST_CONFIG.update(TEST_CONFIG_OVERRIDE)
 
 
 def get_pytest_env_vars():
     """Returns a dict for pytest invocation."""
     ret = {}
 
-    # Override the GCLOUD_PROJECT
-    if TEST_CONFIG['use_build_specific_project']:
-        env_key = TEST_CONFIG['build_specific_project_env']
-        # This should error out if not set.
-        ret['GOOGLE_CLOUD_PROJECT'] = os.environ[env_key]
-        ret['GCLOUD_PROJECT'] = os.environ[env_key]
+    # Override the GCLOUD_PROJECT and the alias.
+    env_key = TEST_CONFIG['gcloud_project_env']
+    # This should error out if not set.
+    ret['GOOGLE_CLOUD_PROJECT'] = os.environ[env_key]
+    ret['GCLOUD_PROJECT'] = os.environ[env_key]
 
     # Apply user supplied envs.
     ret.update(TEST_CONFIG['envs'])
@@ -204,9 +205,6 @@ def cloud_run(session):
 
     # Only update gcloud on Kokoro.
     if os.environ.get("KOKORO_JOB_NAME"):
-        # Update gcloud
-        session.run("gcloud", "components", "update", "--quiet")
-
         # Activate service account
         key_file = os.environ['GOOGLE_APPLICATION_CREDENTIALS']
         session.run(

monitoring/api/v3/alerts-client/test_config.py renamed to noxfile_config.py

@@ -12,22 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-
-# Temporary set BUILD_SPECIFIC_GCLOUD_PROJECT in this file.
-kokoro_job_name = os.environ.get('KOKORO_JOB_NAME')
-if kokoro_job_name and 'python3.7' in kokoro_job_name:
-    os.environ['BUILD_SPECIFIC_GCLOUD_PROJECT'] = 'tmatsuo-test'
-else:
-    os.environ['BUILD_SPECIFIC_GCLOUD_PROJECT'] = os.environ['GCLOUD_PROJECT']
-
 # Default TEST_CONFIG_OVERRIDE for python repos.
 
 # You can copy this file into your directory, then it will be inported from
 # the noxfile.py.
 
 # The source of truth:
-# https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/test_config.py
+# https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/noxfile_config.py
 
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
@@ -42,17 +33,11 @@
     # names for your e2e test.
     'cloud_run_e2e_test_files': ['e2e_test.py'],
 
-    # If set to True, the test will install the library from the root
-    # of the repository.
-    'install_library_from_source': False,
-
-    # Set to True if you want to use the Cloud Project configured for each
-    # build.
-    'use_build_specific_project': True,
-
-    # An envvar key for determining the build specific project. Normally you
-    # don't have to modify this.
-    'build_specific_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
+    # An envvar key for determining the project id to use. Change it
+    # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using
+    # a build specific Cloud project.
+    'gcloud_project_env': 'GCLOUD_PROJECT',
+    # 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
 
     # A dictionary you want to inject into your test. Don't put any
     # secrets here. These values will override predefined values.