Merge pull request #6219 from hashicorp/c-circleci-upgrade-machine-img

upgrade machine image for most jobs
hashicorp · Aug 28, 2019 · ddf2f6b · ddf2f6b
2 parents 3f0f3a0 + d99da5b
commit ddf2f6b
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,6 +41,10 @@ workflows:
       - test-machine:
           name: "test-docker"
           test_packages: "./drivers/docker"
+          # docker is misbehaving in docker-machine-recent image
+          # and we get unexpected failures
+          # e.g. https://circleci.com/gh/hashicorp/nomad/3854
+          executor: go-machine
           <<: *IGNORE_FOR_UI_BRANCHES
       - test-machine:
           name: "test-exec"
@@ -158,14 +162,17 @@ jobs:
           path: /tmp/test-reports
 
   test-machine:
-    executor: go-machine
+    executor: "<< parameters.executor >>"
     parameters:
       test_packages:
         type: string
         default: ""
       exclude_packages:
         type: string
         default: ""
+      executor:
+        type: string
+        default: "go-machine-recent"
     environment:
       <<: *COMMON_ENVS
       GOTEST_PKGS_EXCLUDE: "<< parameters.exclude_packages >>"