From 1cd8af173643b64f6d2f11192f47a19496d4572a Mon Sep 17 00:00:00 2001
From: Mira Leung <miraleung@users.noreply.github.com>
Date: Mon, 5 Oct 2020 13:29:00 -0700
Subject: [PATCH 1/3] fix: use a VM for CircleCI builds

---
 .circleci/config.yml | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cfee57f5a4..4c04ecce00 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,21 +3,40 @@ version: 2.1
 # ======================= JOBS =======================
 jobs:
   gapic-generator-java-tests:
-    docker:
-      - image: l.gcr.io/google/bazel
-    working_directory: /home/circleci/project/gapic-generator-java
+    working_directory: /tmp/
+    environment:
+      TEST_REPORTS_DIR: /tmp/workspace/bazel/reports/gapic-generator-java
+      BAZEL_VERSION: 3.5.1
+    machine: true
     steps:
-      - checkout
+      - checkout:
+          path: gapic-generator-java
+      - attach_workspace:
+          at: workspace
+      - run:
+          name: Install Bazel
+          command: |
+            wget https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh -O bazel_installer.sh
+            chmod +x bazel_installer.sh
+            ./bazel_installer.sh --user
+      - run:
+          name: Make reports directory
+          command: |
+            mkdir -p ${TEST_REPORTS_DIR}
       - run:
-          name: Build targets
+          name: Build targets for gapic-generator-java
           command: |
             bazel --batch build //...
       - run:
-          name: Test targets
+          name: Run unit tests for gapic-generator-java
           command: |
+            cd gapic-generator-java
             bazel --batch test //... --noshow_progress
+            find . -type f -regex ".*/bazel-testlogs/.*xml" -exec cp {} ${TEST_REPORTS_DIR} \;
       - store_test_results:
-          path:  ~/.cache/bazel
+          path: bazel/reports/gapic-generator-java
+      - store_artifacts:
+          path: bazel/reports/gapic-generator-java
   google-java-format:
     docker:
       - image: l.gcr.io/google/bazel

From 69442b77942b5915d191cdc72d45c1db79eeba6a Mon Sep 17 00:00:00 2001
From: Mira Leung <miraleung@users.noreply.github.com>
Date: Mon, 5 Oct 2020 13:34:20 -0700
Subject: [PATCH 2/3] Update config.yml

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4c04ecce00..1501936f96 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,11 +26,12 @@ jobs:
       - run:
           name: Build targets for gapic-generator-java
           command: |
+            cd /tmp/gapic-generator-java
             bazel --batch build //...
       - run:
           name: Run unit tests for gapic-generator-java
           command: |
-            cd gapic-generator-java
+            cd /tmp/gapic-generator-java
             bazel --batch test //... --noshow_progress
             find . -type f -regex ".*/bazel-testlogs/.*xml" -exec cp {} ${TEST_REPORTS_DIR} \;
       - store_test_results:

From 46e9ed9f5fa0cc8a0c531a5cdb433fb02a18c2f1 Mon Sep 17 00:00:00 2001
From: Mira Leung <miraleung@users.noreply.github.com>
Date: Mon, 5 Oct 2020 13:58:16 -0700
Subject: [PATCH 3/3] fix: set python version

---
 .circleci/config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1501936f96..5a5afd7c9d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,12 +7,17 @@ jobs:
     environment:
       TEST_REPORTS_DIR: /tmp/workspace/bazel/reports/gapic-generator-java
       BAZEL_VERSION: 3.5.1
+      PYTHON_VERSION: 3.5.2
     machine: true
     steps:
       - checkout:
           path: gapic-generator-java
       - attach_workspace:
           at: workspace
+      - run:
+          name: Set Python version
+          command: |
+            pyenv global ${PYTHON_VERSION}
       - run:
           name: Install Bazel
           command: |