From 952db46a08b2eb0872c58ac69fe8ba8f46e68345 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 1 Dec 2020 09:26:57 +0100
Subject: [PATCH] [meta] enable metricbeat upgrade test (#940)

This commit enable Metricbeat upgrade test which where disable before
7.10.0 release because Metricbeat 7.10.0 introduce breaking change
preventing upgrade from previous version.

Version post 7.10.0 will now be tested for upgrade from 7.10.0.
---
 helpers/matrix.yml                   | 2 +-
 metricbeat/examples/upgrade/Makefile | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/helpers/matrix.yml b/helpers/matrix.yml
index a8fd93a32..aa2f4b3c4 100644
--- a/helpers/matrix.yml
+++ b/helpers/matrix.yml
@@ -26,7 +26,7 @@ METRICBEAT_SUITE:
   - default
   - oss
   - security
-  #- upgrade TODO: uncomment after 7.10.0 release
+  - upgrade
 LOGSTASH_SUITE:
   - default
   - oss
diff --git a/metricbeat/examples/upgrade/Makefile b/metricbeat/examples/upgrade/Makefile
index 7d32e41dc..5cd564fcc 100644
--- a/metricbeat/examples/upgrade/Makefile
+++ b/metricbeat/examples/upgrade/Makefile
@@ -4,7 +4,7 @@ include ../../../helpers/examples.mk
 
 CHART := metricbeat
 RELEASE := helm-metricbeat-upgrade
-#FROM := 7.10.0	# upgrade from version < 7.10.0 is failing due to selector
+FROM := 7.10.0	# upgrade from version < 7.10.0 is failing due to selector
 								# breaking change in https://github.com/elastic/helm-charts/pull/516
 
 install:
@@ -13,8 +13,7 @@ install:
 	kubectl rollout status deployment $(RELEASE)-metricbeat-metrics
 	kubectl rollout status deployment $(RELEASE)-kube-state-metrics
 
-#TODO: uncomment after 7.10.0 release
-test: #install goss
+test: install goss
 
 purge:
 	helm del $(RELEASE)