From 01033d4fffab621352ceec46d95b8eb4b08e9fc6 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Tue, 31 Mar 2020 16:28:39 -0500
Subject: [PATCH 1/3] CI fixes: quote TESTFLAGS and fix stable release filter

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4e0f7ca8b..2db61fae7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -84,7 +84,7 @@ jobs:
           at: .
       - add-github-auth
       - run: sudo apt-get install lsof
-      - run: make test SHARD_WIDTH=<< parameters.shard_width >> TESTFLAGS=<< parameters.test_flags >> GOARCH=<< parameters.goarch >>
+      - run: make test SHARD_WIDTH=<< parameters.shard_width >> TESTFLAGS="<< parameters.test_flags >>" GOARCH=<< parameters.goarch >>
   cluster-tests:
     executor:
       name: golang
@@ -217,7 +217,7 @@ workflows:
             - test-golang-1.14
           filters:
             branches:
-              only: enterprise
+              ignore: /.*/
             tags:
               only: /^v.*/
       - dockerhub-upload:

From 39d83e7b6f80b3af4790e4c8750681a371b1db39 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Tue, 31 Mar 2020 16:45:46 -0500
Subject: [PATCH 2/3] Add no_output_timeout for the race detector

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2db61fae7..1a7d1a3b3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -84,7 +84,9 @@ jobs:
           at: .
       - add-github-auth
       - run: sudo apt-get install lsof
-      - run: make test SHARD_WIDTH=<< parameters.shard_width >> TESTFLAGS="<< parameters.test_flags >>" GOARCH=<< parameters.goarch >>
+      - run:
+          command: make test SHARD_WIDTH=<< parameters.shard_width >> TESTFLAGS="<< parameters.test_flags >>" GOARCH=<< parameters.goarch >>
+          no_output_timeout: 30m
   cluster-tests:
     executor:
       name: golang

From dc5a4719396024b06f7226718446f0bcad87d28f Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Tue, 31 Mar 2020 17:00:16 -0500
Subject: [PATCH 3/3] Downgrade golangci-lint to 1.23.8 (attempt fix for OOM
 failures)

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1a7d1a3b3..ca992bcfe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,7 +49,7 @@ jobs:
       - attach_workspace:
           at: .
       - add-github-auth
-      - run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.24.0
+      - run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.23.8
       - run: make golangci-lint
   test-build-arm:
     executor: