From 3f7f8e4b97021e804d4ea21966fe4a13aca3d0bf Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Thu, 10 Nov 2016 11:11:47 +0100
Subject: [PATCH] Adapt ES_JVM_OPTIONS packaging test to ubuntu-1204

This commit adapts the "[INIT.D] start Elasticsearch with custom JVM options" packaging test so that it works on ubuntu-1204.

Related to #21445
---
 .../test/resources/packaging/scripts/70_sysv_initd.bats  | 9 +++++----
 .../src/test/resources/packaging/scripts/os_package.bash | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

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 c394dfa40f3..237c8956c40 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
@@ -135,6 +135,7 @@ setup() {
 }
 
 @test "[INIT.D] start Elasticsearch with custom JVM options" {
+    assert_file_exist $ESENVFILE
     local es_java_opts=$ES_JAVA_OPTS
     local es_jvm_options=$ES_JVM_OPTIONS
     local temp=`mktemp -d`
@@ -142,15 +143,15 @@ setup() {
     chown -R elasticsearch:elasticsearch "$temp"
     echo "-Xms512m" >> "$temp/jvm.options"
     echo "-Xmx512m" >> "$temp/jvm.options"
-    cp /etc/sysconfig/elasticsearch "$temp/elasticsearch"
-    echo "ES_JVM_OPTIONS=\"$temp/jvm.options\"" >> /etc/sysconfig/elasticsearch
-    echo "ES_JAVA_OPTS=\"-XX:-UseCompressedOops\"" >> /etc/sysconfig/elasticsearch
+    cp $ESENVFILE "$temp/elasticsearch"
+    echo "ES_JVM_OPTIONS=\"$temp/jvm.options\"" >> $ESENVFILE
+    echo "ES_JAVA_OPTS=\"-XX:-UseCompressedOops\"" >> $ESENVFILE
     service elasticsearch start
     wait_for_elasticsearch_status
     curl -s -XGET localhost:9200/_nodes | fgrep '"heap_init_in_bytes":536870912'
     curl -s -XGET localhost:9200/_nodes | fgrep '"using_compressed_ordinary_object_pointers":"false"'
     service elasticsearch stop
-    cp "$temp/elasticsearch" /etc/sysconfig/elasticsearch
+    cp "$temp/elasticsearch" $ESENVFILE
 }
 
 # Simulates the behavior of a system restart:
diff --git a/qa/vagrant/src/test/resources/packaging/scripts/os_package.bash b/qa/vagrant/src/test/resources/packaging/scripts/os_package.bash
index 4948862d6ab..db274b64985 100644
--- a/qa/vagrant/src/test/resources/packaging/scripts/os_package.bash
+++ b/qa/vagrant/src/test/resources/packaging/scripts/os_package.bash
@@ -36,6 +36,12 @@ export_elasticsearch_paths() {
     export ESDATA="/var/lib/elasticsearch"
     export ESLOG="/var/log/elasticsearch"
     export ESPIDDIR="/var/run/elasticsearch"
+    if is_dpkg; then
+        export ESENVFILE="/etc/default/elasticsearch"
+    fi
+    if is_rpm; then
+        export ESENVFILE="/etc/sysconfig/elasticsearch"
+    fi
 }
 
 # Install the rpm or deb package.