From 720b41c47ef26206faa89fa37939270b8b51b733 Mon Sep 17 00:00:00 2001
From: Mahmood Ali <mahmood@hashicorp.com>
Date: Wed, 20 Nov 2019 20:39:23 -0500
Subject: [PATCH] ci: match ci timeout to go test timeout

make test-nomad sets 15 minute time out for build.  Increase the ci
timeout to 20m, so we can get meaningful output and goroutine stack
traces rather than have test be simply killed by CircleCI.

The extra 5 minutes is a buffer for generating-structs and some
unnecessary padding.
---
 .circleci/config.yml                    | 9 +++++++++
 .circleci/config/commands/run-tests.yml | 1 +
 2 files changed, 10 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83f5280fc..d5a887dc9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -73,6 +73,7 @@ jobs:
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make generate-structs
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make test-nomad
         name: Running Nomad Tests
+        no_output_timeout: 20m
     - store_test_results:
         path: /tmp/test-reports
     - store_artifacts:
@@ -146,6 +147,7 @@ jobs:
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make generate-structs
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make test-nomad
         name: Running Nomad Tests
+        no_output_timeout: 20m
     - store_test_results:
         path: /tmp/test-reports
     - store_artifacts:
@@ -219,6 +221,7 @@ jobs:
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make generate-structs
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make test-nomad
         name: Running Nomad Tests
+        no_output_timeout: 20m
     - store_test_results:
         path: /tmp/test-reports
     - store_artifacts:
@@ -292,6 +295,7 @@ jobs:
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make generate-structs
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make test-nomad
         name: Running Nomad Tests
+        no_output_timeout: 20m
     - store_test_results:
         path: /tmp/test-reports
     - store_artifacts:
@@ -365,6 +369,7 @@ jobs:
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make generate-structs
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make test-nomad
         name: Running Nomad Tests
+        no_output_timeout: 20m
     - store_test_results:
         path: /tmp/test-reports
     - store_artifacts:
@@ -511,6 +516,7 @@ jobs:
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make generate-structs
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make test-nomad
         name: Running Nomad Tests
+        no_output_timeout: 20m
     - store_test_results:
         path: /tmp/test-reports
     - store_artifacts:
@@ -567,6 +573,7 @@ jobs:
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make generate-structs
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make test-nomad
         name: Running Nomad Tests
+        no_output_timeout: 20m
     - store_test_results:
         path: /tmp/test-reports
     - store_artifacts:
@@ -654,6 +661,7 @@ jobs:
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make generate-structs
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make test-nomad
         name: Running Nomad Tests
+        no_output_timeout: 20m
     - store_test_results:
         path: /tmp/test-reports
     - store_artifacts:
@@ -783,6 +791,7 @@ jobs:
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make generate-structs
           sudo -E PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" make test-nomad
         name: Running Nomad Tests
+        no_output_timeout: 20m
     - store_test_results:
         path: /tmp/test-reports
     - store_artifacts:
diff --git a/.circleci/config/commands/run-tests.yml b/.circleci/config/commands/run-tests.yml
index f72a1d7a5..9a90841d3 100644
--- a/.circleci/config/commands/run-tests.yml
+++ b/.circleci/config/commands/run-tests.yml
@@ -1,6 +1,7 @@
 steps:
   - run:
       name: Running Nomad Tests
+      no_output_timeout: 20m
       command: |
         if [ -z $GOTEST_PKGS_EXCLUDE ];
         then