Merge remote-tracking branch 'origin/master' into auth-backend-token-…

…entry-period

.circleci/config/@config.yml

@@ -29,7 +29,7 @@ executors:
     environment:
       GO111MODULE: "off"
       CIRCLECI_CLI_VERSION: 0.1.5546  # Pin CircleCI CLI to patch version (ex: 1.2.3)
-      GO_VERSION: 1.13.7  # Pin Go to patch version (ex: 1.2.3)
+      GO_VERSION: 1.13.8  # Pin Go to patch version (ex: 1.2.3)
       GOTESTSUM_VERSION: 0.3.3  # Pin gotestsum to patch version (ex: 1.2.3)
       GO_TAGS: ""
     working_directory: /go/src/github.com/hashicorp/vault

.circleci/config/commands/check-branch-name.yml

@@ -0,0 +1,14 @@
+description: >
+  Check if branch name starts with ui/ or docs/ and if so, exit.
+steps:
+  - run:
+      working_directory: ~/
+      name: Check branch name
+      command: |
+        # If the branch being tested starts with ui/ or docs/ we want to exit the job without failing
+        [[ "$CIRCLE_BRANCH" = ui/* || "$CIRCLE_BRANCH" = docs/* ]] && {
+          # stop the job from this step
+          circleci-agent step halt
+        }
+        # exit with success either way
+        exit 0

.circleci/config/commands/go_test.yml

@@ -3,6 +3,9 @@ parameters:
   extra_flags:
     type: string
     default: ""
+  log_dir:
+    type: string
+    default: "/tmp/testlogs"
 steps:
   - run:
       name: Run Go tests
@@ -38,6 +41,7 @@ steps:
           VAULT_TOKEN= \
           VAULT_DEV_ROOT_TOKEN_ID= \
           VAULT_ACC= \
+          VAULT_TEST_LOG_DIR=<< parameters.log_dir >> \
           gotestsum --format=short-verbose --junitfile test-results/go-test/results.xml -- \
             -tags "${GO_TAGS}" \
             -timeout=60m \

.circleci/config/jobs/build-go-dev.yml

@@ -12,7 +12,7 @@ steps:
         mkdir ./pkg
 
         # Build dev binary
-        make bootstrap dev
+        make ci-bootstrap dev
   - persist_to_workspace:
       root: .
       paths:

.circleci/config/jobs/test-go-race.yml

@@ -4,7 +4,10 @@ steps:
   - checkout
   - go_test:
       extra_flags: "-race"
+      log_dir: "/tmp/testlogs"
   - store_artifacts:
       path: test-results
   - store_test_results:
       path: test-results
+  - store_artifacts:
+      path: "/tmp/testlogs"

.circleci/config/jobs/test-go.yml

@@ -1,10 +1,14 @@
 executor: go-machine
 parallelism: 2
 steps:
+  - check-branch-name
   - setup-go
   - checkout
-  - go_test
+  - go_test:
+      log_dir: "/tmp/testlogs"
   - store_artifacts:
       path: test-results
   - store_test_results:
       path: test-results
+  - store_artifacts:
+      path: "/tmp/testlogs"