From 0eee5b74023cdb320ae5984187ea6becf936c5d3 Mon Sep 17 00:00:00 2001
From: Daniel Albuquerque <dmartinsalbuqu@expediagroup.com>
Date: Fri, 18 Sep 2020 18:43:27 +0100
Subject: [PATCH] Revert changes in skip analysis condition

---
 pkg/apis/flagger/v1beta1/canary.go    | 2 +-
 test/e2e-istio-tests-skip-analysis.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/apis/flagger/v1beta1/canary.go b/pkg/apis/flagger/v1beta1/canary.go
index 703c4405..3451e796 100644
--- a/pkg/apis/flagger/v1beta1/canary.go
+++ b/pkg/apis/flagger/v1beta1/canary.go
@@ -428,7 +428,7 @@ func (c *Canary) GetMetricInterval() string {
 // SkipAnalysis returns true if the analysis is nil
 // or if spec.SkipAnalysis is true
 func (c *Canary) SkipAnalysis() bool {
-	if c.Spec.Analysis == nil || c.Spec.CanaryAnalysis == nil {
+	if c.Spec.Analysis == nil && c.Spec.CanaryAnalysis == nil {
 		return true
 	}
 	return c.Spec.SkipAnalysis
diff --git a/test/e2e-istio-tests-skip-analysis.sh b/test/e2e-istio-tests-skip-analysis.sh
index 66cc9e71..c6f83db6 100755
--- a/test/e2e-istio-tests-skip-analysis.sh
+++ b/test/e2e-istio-tests-skip-analysis.sh
@@ -71,8 +71,8 @@ spec:
           x-envoy-upstream-rq-timeout-ms: "15000"
           x-envoy-max-retries: "10"
           x-envoy-retry-on: "gateway-error,connect-failure,refused-stream"
+  skipAnalysis: true
   analysis:
-    skipAnalysis: true
     interval: 15s
     threshold: 15
     maxWeight: 30