From 6cd2710ec15ea4bf099675e7478a54e0697f0f24 Mon Sep 17 00:00:00 2001
From: Igor Karpukhin <ikarpukh@redhat.com>
Date: Fri, 28 Aug 2020 15:18:02 +0200
Subject: [PATCH] Fixed 4.4->4.5 upgrade test

---
 .../test-020-olm-upgrade-4.4-4.5.sh           | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/hack/testing-olm-upgrade/test-020-olm-upgrade-4.4-4.5.sh b/hack/testing-olm-upgrade/test-020-olm-upgrade-4.4-4.5.sh
index 35df20070..2ce9999d4 100755
--- a/hack/testing-olm-upgrade/test-020-olm-upgrade-4.4-4.5.sh
+++ b/hack/testing-olm-upgrade/test-020-olm-upgrade-4.4-4.5.sh
@@ -66,6 +66,13 @@ get_es_indices() {
     | xargs -I '{}' oc -n openshift-operators-redhat exec '{}' -c elasticsearch -- es_util --query=_cat/indices
 }
 
+get_es_indices_names() {
+  oc -n openshift-operators-redhat get pods -l component=elasticsearch --no-headers=true --ignore-not-found \
+    | awk 'NR==1{print $1}' \
+    | xargs -I '{}' oc -n openshift-operators-redhat exec '{}' -c elasticsearch -- es_util --query=_cat/indices \
+    | awk '{print $3}'
+}
+
 read_es_indices() {
 	local -n map=$1
 	while IFS= read -r line; do
@@ -141,8 +148,7 @@ try_func_until_text_alt get_es_cluster_status "\"green\"" "\"yellow\"" ${ES_POD_
 # read OLD 4.4 indices into and map them by their names
 log::info "Reading old ES indices"
 try_func_until_result_is_not_empty get_es_indices ${ES_POD_TIMEOUT}
-declare -A old_indices
-read_es_indices old_indices
+old_indices=$(get_es_indices_names)
 
 #### INSTALLING 4.5
 log::info "Deploying the ES operator from the catalog..."
@@ -187,8 +193,12 @@ try_func_until_text_alt get_es_cluster_status "\"green\"" "\"yellow\"" ${ES_POD_
 
 # read new 4.5 indices and map them by their names
 log::info "Reading new ES indices"
-try_func_until_result_is_not_empty get_es_indices ${ES_POD_TIMEOUT}
-declare -A new_indices
-read_es_indices new_indices
+try_func_until_result_is_not_empty get_es_indices_names ${ES_POD_TIMEOUT}
+new_indices=$(get_es_indices_names)
+
+if [ "$old_indices" != "$new_indices" ]; then
+  log:info "Test failed"
+  exit 1
+fi
 
-compare_indices_names old_indices new_indices
\ No newline at end of file
+log:info "Test passed"