test: added submodule and kokoro configs for environment tests (#175)

daniel-sanche · web-flow · commit ae257aa4dc97 · 2021-02-09T12:07:46.000-08:00
diff --git a/.flake8 b/.flake8
@@ -18,6 +18,9 @@
 [flake8]
 ignore = E203, E266, E501, W503
 exclude =
+  # Exclude environment test code.
+  tests/environment/**
+
   # Exclude generated code.
   **/proto/**
   **/gapic/**
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tests/environment"]
+	path = tests/environment
+	url = https://github.com/googleapis/env-tests-logging.git
diff --git a/.kokoro/environment/appengine_flex_container/common.cfg b/.kokoro/environment/appengine_flex_container/common.cfg
@@ -0,0 +1,34 @@
+# 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: "ENVIRONMENT"
+    value: "appengine_flex_container"
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Download resources for system tests (service account key, etc.)
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"
+
+# Use the trampoline script to run in docker.
+build_file: "python-logging/.kokoro/trampoline_v2.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "python-logging/.kokoro/environment_tests.sh"
+}
diff --git a/.kokoro/environment/appengine_flex_container/continuous.cfg b/.kokoro/environment/appengine_flex_container/continuous.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/appengine_flex_container/presubmit.cfg b/.kokoro/environment/appengine_flex_container/presubmit.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/appengine_flex_python/common.cfg b/.kokoro/environment/appengine_flex_python/common.cfg
@@ -0,0 +1,34 @@
+# 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: "ENVIRONMENT"
+    value: "appengine_flex_python"
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Download resources for system tests (service account key, etc.)
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"
+
+# Use the trampoline script to run in docker.
+build_file: "python-logging/.kokoro/trampoline_v2.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "python-logging/.kokoro/environment_tests.sh"
+}
diff --git a/.kokoro/environment/appengine_flex_python/continuous.cfg b/.kokoro/environment/appengine_flex_python/continuous.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/appengine_flex_python/presubmit.cfg b/.kokoro/environment/appengine_flex_python/presubmit.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/appengine_standard/common.cfg b/.kokoro/environment/appengine_standard/common.cfg
@@ -0,0 +1,34 @@
+# 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: "ENVIRONMENT"
+    value: "appengine_standard"
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Download resources for system tests (service account key, etc.)
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"
+
+# Use the trampoline script to run in docker.
+build_file: "python-logging/.kokoro/trampoline_v2.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "python-logging/.kokoro/environment_tests.sh"
+}
diff --git a/.kokoro/environment/appengine_standard/continuous.cfg b/.kokoro/environment/appengine_standard/continuous.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/appengine_standard/presubmit.cfg b/.kokoro/environment/appengine_standard/presubmit.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/cloudrun/common.cfg b/.kokoro/environment/cloudrun/common.cfg
@@ -0,0 +1,34 @@
+# 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: "ENVIRONMENT"
+    value: "cloudrun"
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Download resources for system tests (service account key, etc.)
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"
+
+# Use the trampoline script to run in docker.
+build_file: "python-logging/.kokoro/trampoline_v2.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "python-logging/.kokoro/environment_tests.sh"
+}
diff --git a/.kokoro/environment/cloudrun/continuous.cfg b/.kokoro/environment/cloudrun/continuous.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/cloudrun/presubmit.cfg b/.kokoro/environment/cloudrun/presubmit.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/compute/common.cfg b/.kokoro/environment/compute/common.cfg
@@ -0,0 +1,34 @@
+# 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: "ENVIRONMENT"
+    value: "compute"
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Download resources for system tests (service account key, etc.)
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"
+
+# Use the trampoline script to run in docker.
+build_file: "python-logging/.kokoro/trampoline_v2.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "python-logging/.kokoro/environment_tests.sh"
+}
diff --git a/.kokoro/environment/compute/continuous.cfg b/.kokoro/environment/compute/continuous.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/compute/presubmit.cfg b/.kokoro/environment/compute/presubmit.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/functions/common.cfg b/.kokoro/environment/functions/common.cfg
@@ -0,0 +1,34 @@
+# 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: "ENVIRONMENT"
+    value: "functions"
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Download resources for system tests (service account key, etc.)
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"
+
+# Use the trampoline script to run in docker.
+build_file: "python-logging/.kokoro/trampoline_v2.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "python-logging/.kokoro/environment_tests.sh"
+}
diff --git a/.kokoro/environment/functions/continuous.cfg b/.kokoro/environment/functions/continuous.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/functions/presubmit.cfg b/.kokoro/environment/functions/presubmit.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/kubernetes/common.cfg b/.kokoro/environment/kubernetes/common.cfg
@@ -0,0 +1,34 @@
+# 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: "ENVIRONMENT"
+    value: "kubernetes"
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Download resources for system tests (service account key, etc.)
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-python"
+
+# Use the trampoline script to run in docker.
+build_file: "python-logging/.kokoro/trampoline_v2.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+    key: "TRAMPOLINE_IMAGE"
+    value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "python-logging/.kokoro/environment_tests.sh"
+}
diff --git a/.kokoro/environment/kubernetes/continuous.cfg b/.kokoro/environment/kubernetes/continuous.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment/kubernetes/presubmit.cfg b/.kokoro/environment/kubernetes/presubmit.cfg
@@ -0,0 +1 @@
+# Format: //devtools/kokoro/config/proto/build.proto
diff --git a/.kokoro/environment_tests.sh b/.kokoro/environment_tests.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eox pipefail
+
+if [[ -z "${ENVIRONMENT:-}" ]]; then
+  echo "ENVIRONMENT not set. Exiting"
+  exit 1
+fi
+
+cd python-logging/tests/environment
+
+# Disable buffering, so that the logs stream through.
+export PYTHONUNBUFFERED=1
+
+# Debug: show build environment
+env | grep KOKORO
+
+# Setup service account credentials.
+export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
+gcloud auth activate-service-account --key-file=$GOOGLE_APPLICATION_CREDENTIALS
+
+# Setup project id.
+export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
+gcloud config set project $PROJECT_ID
+
+# authenticate docker
+gcloud auth configure-docker -q
+
+# Remove old nox
+python3.6 -m pip uninstall --yes --quiet nox-automation
+
+# Install nox
+python3.6 -m pip install --upgrade --quiet nox
+python3.6 -m nox --version
+
+# create a unique id for this run
+UUID=$(python  -c 'import uuid; print(uuid.uuid1())' | head -c 7)
+export ENVCTL_ID=ci-$UUID
+echo $ENVCTL_ID
+
+# Run the specified environment test
+set +e
+python3.6 -m nox --session "tests(language='python', platform='$ENVIRONMENT')"
+TEST_STATUS_CODE=$?
+
+# destroy resources
+echo "cleaning up..."
+/workspace/python-logging/tests/environment/envctl/envctl python $ENVIRONMENT destroy
+
+# exit with proper status code
+exit $TEST_STATUS_CODE
diff --git a/.trampolinerc b/.trampolinerc
@@ -15,13 +15,11 @@
 # Template for .trampolinerc
 
 # Add required env vars here.
-required_envvars+=(
-    "STAGING_BUCKET"
-    "V2_STAGING_BUCKET"
-)
+required_envvars+=()
 
 # Add env vars which are passed down into the container here.
 pass_down_envvars+=(
+    "ENVIRONMENT"
     "STAGING_BUCKET"
     "V2_STAGING_BUCKET"
     "NOX_SESSION"
diff --git a/synth.py b/synth.py
diff --git a/tests/environment b/tests/environment

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "tests/environment"]`
	`2`	`+ path = tests/environment`
	`3`	`+ url = https://github.com/googleapis/env-tests-logging.git`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Format: //devtools/kokoro/config/proto/build.proto`