Merge branch 'master' into patch-2

Author: anguillanneuf

.kokoro/docker/Dockerfile

@@ -150,7 +150,7 @@ RUN rm /tmp/get-pip.py
 RUN pip install --no-cache-dir virtualenv
 
 # Setup Cloud SDK
-ENV CLOUD_SDK_VERSION 272.0.0
+ENV CLOUD_SDK_VERSION 293.0.0
 # Use system python for cloud sdk.
 ENV CLOUDSDK_PYTHON python3.6
 RUN wget https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz
@@ -161,4 +161,19 @@ ENV PATH /google-cloud-sdk/bin:$PATH
 # Enable redis-server on boot.
 RUN sudo systemctl enable redis-server.service
 
+# Create a user and allow sudo
+
+# kbuilder uid on the default Kokoro image
+ARG UID=1000
+ARG USERNAME=kbuilder
+
+# Add a new user to the container image.
+# This is needed for ssh and sudo access.
+
+# Add a new user with the caller's uid and the username.
+RUN useradd -d /h -u ${UID} ${USERNAME}
+
+# Allow nopasswd sudo
+RUN echo "${USERNAME} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
 CMD ["python3.6"]

.kokoro/lint/common.cfg

@@ -17,14 +17,14 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/python"
+    value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
 }
 
 # Download trampoline resources.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-docs-samples/.kokoro/trampoline.sh"
+build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
 
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
@@ -41,3 +41,8 @@ env_vars: {
     key: "RUN_TESTS_SESSION"
     value: "lint"
 }
+
+env_vars: {
+    key: "TRAMPOLINE_DOCKERFILE"
+    value: ".kokoro/docker/Dockerfile"
+}

.kokoro/lint/continuous.cfg

@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_head.sh"
+    value: ".kokoro/tests/run_tests_diff_head.sh"
 }

.kokoro/lint/periodic.cfg

@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-docs-samples/.kokoro/tests/run_tests.sh"
+    value: ".kokoro/tests/run_tests.sh"
 }

.kokoro/lint/presubmit.cfg

@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_master.sh"
+    value: ".kokoro/tests/run_tests_diff_master.sh"
 }

.kokoro/python2.7/common.cfg

@@ -26,7 +26,7 @@ env_vars: {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-docs-samples/.kokoro/trampoline.sh"
+build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
 
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
@@ -44,9 +44,13 @@ env_vars: {
     value: "py-2.7"
 }
 
-# Declare build specific Cloud project. It still uses the common one,
-# but we'll update the value once we have more Cloud projects.
+# Declare build specific Cloud project.
 env_vars: {
     key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
     value: "python-docs-samples-tests"
 }
+
+env_vars: {
+    key: "TRAMPOLINE_DOCKERFILE"
+    value: ".kokoro/docker/Dockerfile"
+}

.kokoro/python2.7/continuous.cfg

@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_head.sh"
+    value: ".kokoro/tests/run_tests_diff_head.sh"
 }

.kokoro/python2.7/periodic.cfg

@@ -17,10 +17,10 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-docs-samples/.kokoro/tests/run_tests.sh"
+    value: ".kokoro/tests/run_tests.sh"
 }
 
 env_vars: {
     key: "REPORT_TO_BUILD_COP_BOT"
-    value: "True"
+    value: "true"
 }

.kokoro/python2.7/presubmit.cfg

@@ -17,5 +17,5 @@
 # Tell the trampoline which build file to use.
 env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/python-docs-samples/.kokoro/tests/run_tests_diff_master.sh"
+    value: ".kokoro/tests/run_tests_diff_master.sh"
 }

.kokoro/python3.6/common.cfg

@@ -26,7 +26,7 @@ env_vars: {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-docs-samples/.kokoro/trampoline.sh"
+build_file: "python-docs-samples/.kokoro/trampoline_v2.sh"
 
 # Download secrets from Cloud Storage.
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
@@ -50,3 +50,8 @@ env_vars: {
     key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
     value: "python-docs-samples-tests-py36"
 }
+
+env_vars: {
+    key: "TRAMPOLINE_DOCKERFILE"
+    value: ".kokoro/docker/Dockerfile"
+}