From c30c263aa33ffafdae7ff3d9044d72a64a8e5637 Mon Sep 17 00:00:00 2001
From: Michael Russell <michael.russell@elastic.co>
Date: Wed, 31 Jan 2018 14:39:20 +0100
Subject: [PATCH] Set older version for 5.x and 6.x to test that upgrading
 works as expected

---
 test/integration/xpack.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/integration/xpack.yml b/test/integration/xpack.yml
index cd49ef8..a386732 100644
--- a/test/integration/xpack.yml
+++ b/test/integration/xpack.yml
@@ -10,8 +10,7 @@
   vars:
     es_heap_size: "1g"
     es_templates: true
-    es_major_version: "5.x"
-    es_version: "5.5.1"
+    es_version: "{{ '6.1.1' if es_major_version == '6.x' else '5.4.0'}}" # This is set to an older version than the current default to force an upgrade
     es_enable_xpack: true
     es_xpack_license: "{{ lookup('file', '/tmp/license.json')  }}"
     es_plugins:
@@ -113,8 +112,6 @@
   vars:
     es_heap_size: "1g"
     es_templates: true
-    es_major_version: "6.x"
-    es_version: "6.1.2"
     es_enable_xpack: true
     es_xpack_license: "{{ lookup('file', '/tmp/license.json')  }}"
     es_plugins: