Enable Kokoro testing and remove CircleCI for google-api-core (googleapis#5689)

theacodes · web-flow · commit 7dc531423835 · 2018-07-26T12:27:42.000-07:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,12 +40,6 @@ jobs:
           command: |
             python3.6 test_utils/scripts/get_target_packages.py > ~/target_packages
             cat ~/target_packages
-      - run:
-          name: Run tests - google.api_core
-          command: |
-            if [[ -n $(grep -x api_core ~/target_packages) ]]; then
-              nox -f api_core/nox.py
-            fi
       - run:
           name: Run tests - google.cloud.core
           command: |
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -21,8 +21,12 @@ cd github/google-cloud-python
 # Disable buffering, so that the logs stream through.
 export PYTHONUNBUFFERED=1
 
+# Debug: show build environment
+env | grep KOKORO
+
 # Find out if this package was modified.
-python3.6 -m pip install git+https://github.com/tswast/ci-diff-helper.git
+# Temporarily use Thea's fork of ci-diff-helper w/ Kokoro support.
+python3.6 -m pip install --quiet git+https://github.com/theacodes/ci-diff-helper.git
 python3.6 test_utils/scripts/get_target_packages_kokoro.py > ~/target_packages
 cat ~/target_packages
 
diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg
@@ -11,10 +11,14 @@ action {
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "synthtool/.kokoro/trampoline.sh"
+build_file: "google-cloud-python/.kokoro/trampoline.sh"
 
 # 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-multi"
+}
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/google-cloud-python/.kokoro/build.sh"
 }
diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh
@@ -13,4 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"
+set -eo pipefail
+
+python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"  || ret_code=$?
+
+chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh
+${KOKORO_GFILE_DIR}/trampoline_cleanup.sh || true
+
+exit ${ret_code}
