From ab44b4f86b960ec7120cfd4f7cd337a867dfd7f3 Mon Sep 17 00:00:00 2001
From: Andrew Suderman <andrew@sudermanjr.com>
Date: Thu, 11 Jun 2020 10:41:40 -0600
Subject: [PATCH] CI should not test on tags, only release. Docker build and
 push runs on tag (#87)

* Fix ci for releases

* remove old dep

* Put e2e in the right place

* valid config
---
 .circleci/config.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 311e22bd..8ef7ba02 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -67,6 +67,16 @@ workflows:
   test:
     jobs:
       - test
+      - rok8s-scripts/kubernetes_e2e_tests:
+          requires:
+            - test
+          filters:
+            branches:
+              only: /.*/
+            tags:
+              ignore: /.*/
+          name: functional tests
+          <<: *e2e_config
       - rok8s-scripts/docker_build_and_push:
           name: build-container
           docker-push: false
@@ -76,6 +86,7 @@ workflows:
           config_file: .circleci/build.config
           requires:
             - test
+            - functional tests
           filters:
             branches:
               only: /pull\/[0-9]+/
@@ -91,19 +102,13 @@ workflows:
           username: fairwinds+circleci
           requires:
             - test
+            - functional tests
           filters:
             branches:
               ignore: /pull\/[0-9]+/
 
   release:
     jobs:
-      - test:
-          filters:
-            branches:
-              only: /.*/
-      - rok8s-scripts/kubernetes_e2e_tests:
-          name: run functional tests
-          <<: *e2e_config
       - release_binary:
           filters:
             branches:
@@ -120,8 +125,6 @@ workflows:
           password-variable: "fairwinds_quay_token"
           registry: quay.io
           username: fairwinds+circleci
-          requires:
-            - test
           filters:
             branches:
               ignore: /.*/