chore: Update testing configs and structure for speed (#578)

* Initial test config changes

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/master/packages/owl-bot/README.md

* Update build configs to match google3 job configs

* Rename required presubmit CI check

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Force OwlBot to avoid overwriting Kokoro configs

* Undo OwlBot overwrite

* Update OwlBot.py

* Fix double install of SDK in sample nox sessions

* Empty requirements.txt files to trigger Sample CI

* Update Nox env var to use spaces, not csv

* Update parallel dist in presubmit

* Address reviewer comments, final changes

* Limit presubmit to unit-3.6, widen release presubmit to all unit tests

* Update presubmit to unit-3.7 only

* Unit 3.6, 3.7 in presubmit to check coverage

* Presubmit to unit-3.8

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

.github/sync-repo-settings.yaml

@@ -8,6 +8,5 @@ branchProtectionRules:
   requiresCodeOwnerReviews: true
   requiresStrictStatusChecks: true
   requiredStatusCheckContexts:
-    - 'Kokoro'
     - 'cla/google'
-    - 'Samples - Lint'
+    - 'Presubmit - Unit Tests'

.kokoro/continuous/system.cfg

@@ -0,0 +1,10 @@
+env_vars: {
+    key: "NOX_SESSION"
+    value: "system-3.8"
+}
+
+# Run system tests in parallel, splitting up by file
+env_vars: {
+    key: "PYTEST_ADDOPTS"
+    value: "-n=auto --dist=loadfile"
+}

.kokoro/continuous/unit.cfg

@@ -0,0 +1,11 @@
+# Run all unit test sessions, in Python 3.6 to 3.9
+env_vars: {
+    key: "NOX_SESSION"
+    value: "unit"
+}
+
+# Run unit tests in parallel, splitting up by test
+env_vars: {
+    key: "PYTEST_ADDOPTS"
+    value: "-n=auto"
+}

.kokoro/presubmit/presubmit.cfg

@@ -1 +1,13 @@
-# Format: //devtools/kokoro/config/proto/build.proto
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Run all sessions except system tests and docs builds
+env_vars: {
+    key: "NOX_SESSION"
+    value: "unit-3.8 lint lint_setup_py blacken cover"
+}
+
+# Run unit tests in parallel, splitting up by file
+env_vars: {
+    key: "PYTEST_ADDOPTS"
+    value: "-n=auto --dist=loadfile"
+}

.kokoro/presubmit/release.cfg

@@ -0,0 +1,11 @@
+# Run system tests in presubmit for library releases
+env_vars: {
+    key: "NOX_SESSION"
+    value: "system-3.8 unit"
+}
+
+# Run system tests in parallel, splitting up by file
+env_vars: {
+    key: "PYTEST_ADDOPTS"
+    value: "-n=auto --dist=loadfile"
+}

owlbot.py

@@ -86,6 +86,7 @@
     templated_files,
     excludes=[
         ".coveragerc",
+        ".kokoro/**/*.cfg"
     ]
 )  # the microgenerator has a good coveragerc file
 

samples/model-builder/noxfile_config.py

@@ -38,5 +38,7 @@
     "pip_version_override": None,
     # A dictionary you want to inject into your test. Don't put any
     # secrets here. These values will override predefined values.
-    "envs": {},
+    "envs": {
+        "PYTEST_ADDOPTS": "-n=auto"  # Run tests parallel using all available CPUs
+    },
 }

samples/model-builder/requirements-test.txt

@@ -0,0 +1,2 @@
+pytest==6.2.4
+pytest-xdist

samples/model-builder/requirements.txt

@@ -1,2 +1 @@
-pytest >= 6.2
-git+https://github.com/googleapis/python-aiplatform.git@mb-release#egg=google-cloud-aiplatform
+google-cloud-aiplatform

samples/snippets/noxfile_config.py

@@ -29,6 +29,7 @@
     # A dictionary you want to inject into your test. Don't put any
     # secrets here. These values will override predefined values.
     "envs": {
-        "DATA_LABELING_API_ENDPOINT": "us-central1-autopush-aiplatform.sandbox.googleapis.com"
+        "DATA_LABELING_API_ENDPOINT": "us-central1-autopush-aiplatform.sandbox.googleapis.com",
+        "PYTEST_ADDOPTS": "-n=auto"  # Run tests parallel using all available CPUs
     },
 }

samples/snippets/requirements-test.txt

@@ -0,0 +1,2 @@
+pytest==6.2.4
+pytest-xdist

samples/snippets/requirements.txt

@@ -1,3 +1 @@
-pytest==6.2.4
-google-cloud-storage>=1.26.0, <2.0.0dev
-google-cloud-aiplatform==1.3.0
+google-cloud-aiplatform

setup.py

@@ -35,7 +35,7 @@
 full_extra_require = list(
     set(tensorboard_extra_require + metadata_extra_require + xai_extra_require)
 )
-testing_extra_require = full_extra_require + ["grpcio-testing"]
+testing_extra_require = full_extra_require + ["grpcio-testing", "pytest-xdist"]
 
 
 setuptools.setup(