🦉 Updates from OwlBot post-processor

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

.kokoro/samples/python3.6/common.cfg

@@ -0,0 +1,40 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+ define_artifacts {
+ regex: "**/*sponge_log.xml"
+ }
+}
+
+# Specify which tests to run
+env_vars: {
+ key: "RUN_TESTS_SESSION"
+ value: "py-3.6"
+}
+
+# Declare build specific Cloud project.
+env_vars: {
+ key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
+ value: "ucaip-sample-tests"
+}
+
+env_vars: {
+ key: "TRAMPOLINE_BUILD_FILE"
+ value: "github/python-aiplatform/.kokoro/test-samples.sh"
+}
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+ key: "TRAMPOLINE_IMAGE"
+ value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
+}
+
+# Download secrets for samples
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "python-aiplatform/.kokoro/trampoline_v2.sh"

.kokoro/samples/python3.6/continuous.cfg

@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+ key: "INSTALL_LIBRARY_FROM_SOURCE"
+ value: "True"
+}
+

.kokoro/samples/python3.6/periodic-head.cfg

@@ -0,0 +1,11 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+ key: "INSTALL_LIBRARY_FROM_SOURCE"
+ value: "True"
+}
+
+env_vars: {
+ key: "TRAMPOLINE_BUILD_FILE"
+ value: "github/python-aiplatform/.kokoro/test-samples-against-head.sh"
+}

.kokoro/samples/python3.6/periodic.cfg

@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+ key: "INSTALL_LIBRARY_FROM_SOURCE"
+ value: "False"
+}

.kokoro/samples/python3.6/presubmit.cfg

@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+ key: "INSTALL_LIBRARY_FROM_SOURCE"
+ value: "True"
+}

.kokoro/test-samples-impl.sh

@@ -33,7 +33,7 @@ export PYTHONUNBUFFERED=1
 env | grep KOKORO
 
 # Install nox
-python3.7 -m pip install --upgrade --quiet nox
+python3.6 -m pip install --upgrade --quiet nox
 
 # Use secrets acessor service account to get secrets
 if [[ -f "${KOKORO_GFILE_DIR}/secrets_viewer_service_account.json" ]]; then
@@ -76,7 +76,7 @@ for file in samples/**/requirements.txt; do
  echo "------------------------------------------------------------"
 
  # Use nox to execute the tests for the project.
- python3.7 -m nox -s "$RUN_TESTS_SESSION"
+ python3.6 -m nox -s "$RUN_TESTS_SESSION"
  EXIT=$?
 
  # If this is a periodic build, send the test log to the FlakyBot.

google/cloud/aiplatform_v1/services/migration_service/client.py

@@ -218,40 +218,40 @@ def parse_dataset_path(path: str) -> Dict[str, str]:
  @staticmethod
  def dataset_path(
  project: str,
+ location: str,
  dataset: str,
  ) -> str:
  """Returns a fully-qualified dataset string."""
- return "projects/{project}/datasets/{dataset}".format(
+ return "projects/{project}/locations/{location}/datasets/{dataset}".format(
  project=project,
+ location=location,
  dataset=dataset,
  )
 
  @staticmethod
  def parse_dataset_path(path: str) -> Dict[str, str]:
  """Parses a dataset path into its component segments."""
- m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
+ m = re.match(
+ r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
+ path,
+ )
  return m.groupdict() if m else {}
 
  @staticmethod
  def dataset_path(
  project: str,
- location: str,
  dataset: str,
  ) -> str:
  """Returns a fully-qualified dataset string."""
- return "projects/{project}/locations/{location}/datasets/{dataset}".format(
+ return "projects/{project}/datasets/{dataset}".format(
  project=project,
- location=location,
  dataset=dataset,
  )
 
  @staticmethod
  def parse_dataset_path(path: str) -> Dict[str, str]:
  """Parses a dataset path into its component segments."""
- m = re.match(
- r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
- path,
- )
+ m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
  return m.groupdict() if m else {}
 
  @staticmethod

google/cloud/aiplatform_v1/types/model_service.py

@@ -121,12 +121,19 @@ class UploadModelResponse(proto.Message):
  model (str):
  The name of the uploaded Model resource. Format:
  ``projects/{project}/locations/{location}/models/{model}``
+ model_version_id (str):
+ Output only. The version ID of the model that
+ is uploaded.
  """
 
  model = proto.Field(
  proto.STRING,
  number=1,
  )
+ model_version_id = proto.Field(
+ proto.STRING,
+ number=2,
+ )
 
 
 class GetModelRequest(proto.Message):