From b4350e31beabe1705fb550c475dc16bafcfbf5ce Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Tue, 29 Sep 2015 20:01:28 +0200
Subject: [PATCH] install groovy plugin before running script test

groovy moved to a plugin but the tests rely on it
see #13834
---
 .../test/resources/packaging/scripts/20_tar_package.bats    | 6 ++----
 .../test/resources/packaging/scripts/30_deb_package.bats    | 2 ++
 .../test/resources/packaging/scripts/40_rpm_package.bats    | 2 ++
 .../src/test/resources/packaging/scripts/60_systemd.bats    | 2 ++
 .../src/test/resources/packaging/scripts/70_sysv_initd.bats | 2 ++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/qa/vagrant/src/test/resources/packaging/scripts/20_tar_package.bats b/qa/vagrant/src/test/resources/packaging/scripts/20_tar_package.bats
index 2ceeb2a72b9f5..383375f9531c3 100644
--- a/qa/vagrant/src/test/resources/packaging/scripts/20_tar_package.bats
+++ b/qa/vagrant/src/test/resources/packaging/scripts/20_tar_package.bats
@@ -31,6 +31,7 @@
 # Load test utilities
 load packaging_test_utils
 load tar
+load plugins
 
 setup() {
     skip_not_tar_gz
@@ -91,12 +92,9 @@ setup() {
     # starting Elasticsearch so we don't have to wait for elasticsearch to scan for
     # them.
     install_elasticsearch_test_scripts
-
+    ESPLUGIN_COMMAND_USER=elasticsearch install_and_check_plugin lang groovy
     start_elasticsearch_service
-
     run_elasticsearch_tests
-
     stop_elasticsearch_service
-
     rm -rf "/tmp/elasticsearch"
 }
diff --git a/qa/vagrant/src/test/resources/packaging/scripts/30_deb_package.bats b/qa/vagrant/src/test/resources/packaging/scripts/30_deb_package.bats
index d0a692194f829..553f867f60d97 100644
--- a/qa/vagrant/src/test/resources/packaging/scripts/30_deb_package.bats
+++ b/qa/vagrant/src/test/resources/packaging/scripts/30_deb_package.bats
@@ -32,6 +32,7 @@
 # Load test utilities
 load packaging_test_utils
 load os_package
+load plugins
 
 # Cleans everything for the 1st execution
 setup() {
@@ -85,6 +86,7 @@ setup() {
     # starting Elasticsearch so we don't have to wait for elasticsearch to scan for
     # them.
     install_elasticsearch_test_scripts
+    ESPLUGIN_COMMAND_USER=root install_and_check_plugin lang groovy
     start_elasticsearch_service
     run_elasticsearch_tests
 }
diff --git a/qa/vagrant/src/test/resources/packaging/scripts/40_rpm_package.bats b/qa/vagrant/src/test/resources/packaging/scripts/40_rpm_package.bats
index 91b6d8c0156b3..7f447e51cb3be 100644
--- a/qa/vagrant/src/test/resources/packaging/scripts/40_rpm_package.bats
+++ b/qa/vagrant/src/test/resources/packaging/scripts/40_rpm_package.bats
@@ -31,6 +31,7 @@
 # Load test utilities
 load packaging_test_utils
 load os_package
+load plugins
 
 # Cleans everything for the 1st execution
 setup() {
@@ -80,6 +81,7 @@ setup() {
     # starting Elasticsearch so we don't have to wait for elasticsearch to scan for
     # them.
     install_elasticsearch_test_scripts
+    ESPLUGIN_COMMAND_USER=root install_and_check_plugin lang groovy
     start_elasticsearch_service
     run_elasticsearch_tests
 }
diff --git a/qa/vagrant/src/test/resources/packaging/scripts/60_systemd.bats b/qa/vagrant/src/test/resources/packaging/scripts/60_systemd.bats
index 76487fc1b3c18..6558a3831b35f 100644
--- a/qa/vagrant/src/test/resources/packaging/scripts/60_systemd.bats
+++ b/qa/vagrant/src/test/resources/packaging/scripts/60_systemd.bats
@@ -31,6 +31,7 @@
 # Load test utilities
 load packaging_test_utils
 load os_package
+load plugins
 
 # Cleans everything for the 1st execution
 setup() {
@@ -67,6 +68,7 @@ setup() {
     # starting Elasticsearch so we don't have to wait for elasticsearch to scan for
     # them.
     install_elasticsearch_test_scripts
+    ESPLUGIN_COMMAND_USER=root install_and_check_plugin lang groovy
     systemctl start elasticsearch.service
     wait_for_elasticsearch_status
     assert_file_exist "/var/run/elasticsearch/elasticsearch.pid"
diff --git a/qa/vagrant/src/test/resources/packaging/scripts/70_sysv_initd.bats b/qa/vagrant/src/test/resources/packaging/scripts/70_sysv_initd.bats
index bb6e44c4e0c25..1c5cce5917451 100644
--- a/qa/vagrant/src/test/resources/packaging/scripts/70_sysv_initd.bats
+++ b/qa/vagrant/src/test/resources/packaging/scripts/70_sysv_initd.bats
@@ -31,6 +31,7 @@
 # Load test utilities
 load packaging_test_utils
 load os_package
+load plugins
 
 # Cleans everything for the 1st execution
 setup() {
@@ -69,6 +70,7 @@ setup() {
     # Install scripts used to test script filters and search templates before
     # starting Elasticsearch so we don't have to wait for elasticsearch to scan for
     # them.
+    ESPLUGIN_COMMAND_USER=root install_and_check_plugin lang groovy
     install_elasticsearch_test_scripts
     service elasticsearch start
     wait_for_elasticsearch_status