From 00afd55a27980bbf8b4a57b4393dd36ae919a3e3 Mon Sep 17 00:00:00 2001
From: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Date: Mon, 13 Sep 2021 10:24:14 -0700
Subject: [PATCH] Run acc. tests only

---
 .circleci/config.yml | 116 ++++++++++++++++++++-----------------------
 1 file changed, 54 insertions(+), 62 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7dceb7956..d23f194549 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -873,69 +873,61 @@ workflows:
   test-and-build:
     jobs:
       # Fmt, vet, lint control plane and helm code
-      - go-fmt-and-vet-control-plane
-      - lint-control-plane
-      - go-fmt-and-vet-acceptance
-      - go-fmt-and-vet-helm-gen
-      # Unit test control plane
-      - test-control-plane:
-          requires:
-            - go-fmt-and-vet-control-plane
-            - lint-control-plane
-      - test-enterprise-control-plane:
-          filters:
-            branches:
-              # Forked pull requests have CIRCLE_BRANCH set to pull/XXX.
-              ignore: /pull\/[0-9]+/
-          requires:
-            - go-fmt-and-vet-control-plane
-            - lint-control-plane
-      # Unit tests for go modules in helm and bats tests for templates
-      - unit-acceptance-framework:
-          requires:
-            - go-fmt-and-vet-acceptance
-      - unit-helm-gen:
-          requires:
-            - go-fmt-and-vet-helm-gen
-      - validate-helm-gen
-      - unit-test-helm-templates
-      # Build control plane binaries
-      - build-distro:
-          OS: "freebsd linux windows"
-          ARCH: "386"
-          name: build-distros-386
-          requires:
-            - test-control-plane
-            - test-enterprise-control-plane
-      - build-distro:
-          OS: "darwin freebsd linux solaris windows"
-          ARCH: "amd64"
-          name: build-distros-amd64
-          requires:
-            - test-control-plane
-            - test-enterprise-control-plane
-      - build-distro:
-          OS: "linux"
-          ARCH: "arm arm64"
-          name: build-distros-arm-arm64
-          requires:
-            - test-control-plane
-            - test-enterprise-control-plane
-      - dev-upload-docker:
-          context: consul-ci
-          requires:
-            - build-distros-amd64
+#      - go-fmt-and-vet-control-plane
+#      - lint-control-plane
+#      - go-fmt-and-vet-acceptance
+#      - go-fmt-and-vet-helm-gen
+#      # Unit test control plane
+#      - test-control-plane:
+#          requires:
+#            - go-fmt-and-vet-control-plane
+#            - lint-control-plane
+#      - test-enterprise-control-plane:
+#          filters:
+#            branches:
+#              # Forked pull requests have CIRCLE_BRANCH set to pull/XXX.
+#              ignore: /pull\/[0-9]+/
+#          requires:
+#            - go-fmt-and-vet-control-plane
+#            - lint-control-plane
+#      # Unit tests for go modules in helm and bats tests for templates
+#      - unit-acceptance-framework:
+#          requires:
+#            - go-fmt-and-vet-acceptance
+#      - unit-helm-gen:
+#          requires:
+#            - go-fmt-and-vet-helm-gen
+#      - validate-helm-gen
+#      - unit-test-helm-templates
+#      # Build control plane binaries
+#      - build-distro:
+#          OS: "freebsd linux windows"
+#          ARCH: "386"
+#          name: build-distros-386
+#          requires:
+#            - test-control-plane
+#            - test-enterprise-control-plane
+#      - build-distro:
+#          OS: "darwin freebsd linux solaris windows"
+#          ARCH: "amd64"
+#          name: build-distros-amd64
+#          requires:
+#            - test-control-plane
+#            - test-enterprise-control-plane
+#      - build-distro:
+#          OS: "linux"
+#          ARCH: "arm arm64"
+#          name: build-distros-arm-arm64
+#          requires:
+#            - test-control-plane
+#            - test-enterprise-control-plane
+#      - dev-upload-docker:
+#          context: consul-ci
+#          requires:
+#            - build-distros-amd64
       # Run acceptance tests using the docker image built for the control plane
-      - acceptance:
-          requires:
-            - dev-upload-docker
-            - unit-test-helm-templates
-            - unit-acceptance-framework
-      - acceptance-tproxy:
-          requires:
-            - dev-upload-docker
-            - unit-test-helm-templates
-            - unit-acceptance-framework
+      - acceptance
+      - acceptance-tproxy
   nightly-acceptance-tests:
     triggers:
       - schedule: