From fe13b8ca72f5e9c71b04d0b91cc748f0ce52b401 Mon Sep 17 00:00:00 2001
From: Joshua Chong <joshchong@gmail.com>
Date: Fri, 21 Feb 2020 17:33:50 -0800
Subject: [PATCH] LRQA-54968 Clean up setup of LTR properties

---
 build-test-elasticsearch6.xml | 33 ++++++-----------------
 build-test-elasticsearch7.xml | 33 ++++++-----------------
 test.properties               | 50 -----------------------------------
 3 files changed, 16 insertions(+), 100 deletions(-)

diff --git a/build-test-elasticsearch6.xml b/build-test-elasticsearch6.xml
index 2142fba6967976..50688eb2ee3598 100644
--- a/build-test-elasticsearch6.xml
+++ b/build-test-elasticsearch6.xml
@@ -23,25 +23,7 @@ xpack.ssl.key: certs/localhost/localhost.key</echo>
 		</sequential>
 	</macrodef>
 
-	<macrodef name="configure-elasticsearch6-ltr-test-properties">
-		<sequential>
-			<var name="elasticsearch.version" unset="true" />
-			<var name="elasticsearch.ltr-linear-regression-model.zip.name" unset="true" />
-			<var name="elasticsearch.ltr-linear-regression-model.zip.url" unset="true" />
-			<var name="elasticsearch.ltr.url" unset="true" />
-			<var name="elasticsearch.ltr.version" unset="true" />
-			<var name="elasticsearch.ltr.zip.nam" unset="true" />
-
-			<property name="elasticsearch.version" value="6.8.6" />
-			<property name="elasticsearch.ltr.version" value="1.1.1" />
-			<property name="elasticsearch.ltr-linear-regression-model.zip.name" value="ltr-linear-regression-model.zip" />
-			<property name="elasticsearch.ltr-linear-regression-model.zip.url" value="http://files.liferay.com/private/apps/elastic/elasticsearch/${elasticsearch.ltr-linear-regression-model.zip.name}" />
-			<property name="elasticsearch.ltr.zip.name" value="ltr-${elasticsearch.ltr.version}-es${elasticsearch.version}.zip" />
-			<property name="elasticsearch.ltr.url" value="http://es-learn-to-rank.labs.o19s.com/${elasticsearch.ltr.zip.name}" />
-		</sequential>
-	</macrodef>
-
-	<macrodef name="configure-elasticsearch68-test-properties">
+	<macrodef name="configure-elasticsearch68-ltr-test-properties">
 		<sequential>
 			<var name="elasticsearch.version" unset="true" />
 			<var name="elasticsearch.dir" unset="true" />
@@ -68,6 +50,11 @@ xpack.ssl.key: certs/localhost/localhost.key</echo>
 			<property name="elasticsearch.analysis-stempel.zip.url" value="https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-stempel/${elasticsearch.analysis-stempel.zip.name}" />
 			<property name="elasticsearch.zip.name" value="elasticsearch-${elasticsearch.version}.zip" />
 			<property name="elasticsearch.zip.url" value="https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.zip.name}" />
+			<property name="elasticsearch.ltr.version" value="1.1.1" />
+			<property name="elasticsearch.ltr-linear-regression-model.zip.name" value="ltr-linear-regression-model.zip" />
+			<property name="elasticsearch.ltr-linear-regression-model.zip.url" value="http://files.liferay.com/private/apps/elastic/elasticsearch/${elasticsearch.ltr-linear-regression-model.zip.name}" />
+			<property name="elasticsearch.ltr.zip.name" value="ltr-${elasticsearch.ltr.version}-es${elasticsearch.version}.zip" />
+			<property name="elasticsearch.ltr.url" value="http://es-learn-to-rank.labs.o19s.com/${elasticsearch.ltr.zip.name}" />
 		</sequential>
 	</macrodef>
 
@@ -637,9 +624,7 @@ ${line.separator}CATALINA_OPTS="${CATALINA_OPTS} -Djavax.net.ssl.trustStore=${el
 	</target>
 
 	<target name="add-ltr-linear-regression-model">
-		<configure-elasticsearch68-test-properties />
-
-		<configure-elasticsearch6-ltr-test-properties />
+		<configure-elasticsearch68-ltr-test-properties />
 
 		<unzip-ltr-linear-regression-model />
 
@@ -734,9 +719,7 @@ xpack.monitoring.collection.enabled: true</echo>
 		<if>
 			<equals arg1="${remote.elasticsearch.ltr.enabled}" arg2="true" />
 			<then>
-				<configure-elasticsearch68-test-properties />
-
-				<configure-elasticsearch6-ltr-test-properties />
+				<configure-elasticsearch68-ltr-test-properties />
 			</then>
 		</if>
 
diff --git a/build-test-elasticsearch7.xml b/build-test-elasticsearch7.xml
index 3a5cf82394d3db..216448be69cfcd 100644
--- a/build-test-elasticsearch7.xml
+++ b/build-test-elasticsearch7.xml
@@ -25,24 +25,6 @@ xpack.security.transport.ssl.verification_mode: certificate</echo>
 		</sequential>
 	</macrodef>
 
-	<macrodef name="configure-elasticsearch7-ltr-test-properties">
-		<sequential>
-			<var name="elasticsearch.version" unset="true" />
-			<var name="elasticsearch.ltr-linear-regression-model.zip.name" unset="true" />
-			<var name="elasticsearch.ltr-linear-regression-model.zip.url" unset="true" />
-			<var name="elasticsearch.ltr.url" unset="true" />
-			<var name="elasticsearch.ltr.version" unset="true" />
-			<var name="elasticsearch.ltr.zip.nam" unset="true" />
-
-			<property name="elasticsearch.version" value="7.5.1" />
-			<property name="elasticsearch.ltr.version" value="1.1.2" />
-			<property name="elasticsearch.ltr-linear-regression-model.zip.name" value="ltr-linear-regression-model.zip" />
-			<property name="elasticsearch.ltr-linear-regression-model.zip.url" value="http://files.liferay.com/private/apps/elastic/elasticsearch/${elasticsearch.ltr-linear-regression-model.zip.name}" />
-			<property name="elasticsearch.ltr.zip.name" value="ltr-${elasticsearch.ltr.version}-es${elasticsearch.version}.zip" />
-			<property name="elasticsearch.ltr.url" value="http://es-learn-to-rank.labs.o19s.com/${elasticsearch.ltr.zip.name}" />
-		</sequential>
-	</macrodef>
-
 	<macrodef name="configure-elasticsearch7-test-properties">
 		<sequential>
 			<var name="elastic.kibana.dir" unset="true" />
@@ -89,7 +71,7 @@ xpack.security.transport.ssl.verification_mode: certificate</echo>
 		</sequential>
 	</macrodef>
 
-	<macrodef name="configure-elasticsearch75-test-properties">
+	<macrodef name="configure-elasticsearch75-ltr-test-properties">
 		<sequential>
 			<var name="elasticsearch.version" unset="true" />
 			<var name="elasticsearch.dir" unset="true" />
@@ -124,6 +106,11 @@ xpack.security.transport.ssl.verification_mode: certificate</echo>
 			<property name="elasticsearch.tar.url.linux" value="https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.tar.name.linux}" />
 			<property name="elasticsearch.tar.url.mac" value="https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.tar.name.mac}" />
 			<property name="elasticsearch.zip.url.windows" value="https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.zip.name.windows}" />
+			<property name="elasticsearch.ltr.version" value="1.1.2" />
+			<property name="elasticsearch.ltr-linear-regression-model.zip.name" value="ltr-linear-regression-model.zip" />
+			<property name="elasticsearch.ltr-linear-regression-model.zip.url" value="http://files.liferay.com/private/apps/elastic/elasticsearch/${elasticsearch.ltr-linear-regression-model.zip.name}" />
+			<property name="elasticsearch.ltr.zip.name" value="ltr-${elasticsearch.ltr.version}-es${elasticsearch.version}.zip" />
+			<property name="elasticsearch.ltr.url" value="http://es-learn-to-rank.labs.o19s.com/${elasticsearch.ltr.zip.name}" />
 		</sequential>
 	</macrodef>
 
@@ -761,9 +748,7 @@ ${line.separator}CATALINA_OPTS="${CATALINA_OPTS} -Djavax.net.ssl.trustStore=${el
 	</target>
 
 	<target name="add-ltr-linear-regression-model">
-		<configure-elasticsearch75-test-properties />
-
-		<configure-elasticsearch7-ltr-test-properties />
+		<configure-elasticsearch75-ltr-test-properties />
 
 		<unzip-ltr-linear-regression-model />
 
@@ -872,7 +857,7 @@ xpack.monitoring.collection.enabled: true</echo>
 		<if>
 			<equals arg1="${remote.elasticsearch.ltr.enabled}" arg2="true" />
 			<then>
-				<configure-elasticsearch75-test-properties />
+				<configure-elasticsearch75-ltr-test-properties />
 			</then>
 			<else>
 				<configure-elasticsearch7-test-properties />
@@ -886,8 +871,6 @@ xpack.monitoring.collection.enabled: true</echo>
 		<if>
 			<equals arg1="${remote.elasticsearch.ltr.enabled}" arg2="true" />
 			<then>
-				<configure-elasticsearch7-ltr-test-properties />
-
 				<prepare-elasticsearch-ltr />
 
 				<echo append="true" file="${elasticsearch.dir}/config/elasticsearch.yml">${line.separator}path.repo: ${liferay.home}/data/elasticsearch7/repo</echo>
diff --git a/test.properties b/test.properties
index 52bf75af06a91b..c77515b2304cad 100644
--- a/test.properties
+++ b/test.properties
@@ -631,29 +631,6 @@
     elasticsearch.zip.name=elasticsearch-${elasticsearch.version}.zip
     elasticsearch.zip.url=https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.zip.name}
 
-    #
-    # Uncommment the following lines to deploy Elasticsearch 6.8.6
-    # instead of Elasticsearch 6.8.6.
-    #
-    #elasticsearch.ltr.version=1.1.1
-    #elasticsearch.ltr-linear-regression-model.zip.name=ltr-linear-regression-model.zip
-    #elasticsearch.ltr-linear-regression-model.zip.url=http://files.liferay.com/private/apps/elastic/elasticsearch/${elasticsearch.ltr-linear-regression-model.zip.name}
-    #elasticsearch.ltr.zip.name=ltr-${elasticsearch.ltr.version}-es${elasticsearch.version}.zip
-    #elasticsearch.ltr.url=http://es-learn-to-rank.labs.o19s.com/${elasticsearch.ltr.zip.name}
-
-    #elasticsearch.version=6.8.6
-    #elasticsearch.dir=${app.server.parent.dir}/elasticsearch-${elasticsearch.version}
-    #elasticsearch.analysis-icu.zip.name=analysis-icu-${elasticsearch.version}.zip
-    #elasticsearch.analysis-icu.zip.url=https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/${elasticsearch.analysis-icu.zip.name}
-    #elasticsearch.analysis-kuromoji.zip.name=analysis-kuromoji-${elasticsearch.version}.zip
-    #elasticsearch.analysis-kuromoji.zip.url=https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-kuromoji/${elasticsearch.analysis-kuromoji.zip.name}
-    #elasticsearch.analysis-smartcn.zip.name=analysis-smartcn-${elasticsearch.version}.zip
-    #elasticsearch.analysis-smartcn.zip.url=https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-smartcn/${elasticsearch.analysis-smartcn.zip.name}
-    #elasticsearch.analysis-stempel.zip.name=analysis-stempel-${elasticsearch.version}.zip
-    #elasticsearch.analysis-stempel.zip.url=https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-stempel/${elasticsearch.analysis-stempel.zip.name}
-    #elasticsearch.zip.name=elasticsearch-${elasticsearch.version}.zip
-    #elasticsearch.zip.url=https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.zip.name}
-
     #
     # Uncommment the following lines to deploy Elasticsearch 7.6.0
     # instead of Elasticsearch 6.8.6.
@@ -683,33 +660,6 @@
     #elasticsearch.tar.url.mac=https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.tar.name.mac}
     #elasticsearch.zip.url.windows=https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.zip.name.windows}
 
-    #
-    # Uncommment the following lines to deploy Elasticsearch 7.5.1
-    # instead of Elasticsearch 6.8.6.
-    #
-    #elasticsearch.ltr.version=1.1.2
-    #elasticsearch.ltr-linear-regression-model.zip.name=ltr-linear-regression-model.zip
-    #elasticsearch.ltr-linear-regression-model.zip.url=http://files.liferay.com/private/apps/elastic/elasticsearch/${elasticsearch.ltr-linear-regression-model.zip.name}
-    #elasticsearch.ltr.url=http://es-learn-to-rank.labs.o19s.com/${elasticsearch.ltr.zip.name}
-    #elasticsearch.ltr.zip.name=ltr-${elasticsearch.ltr.version}-es${elasticsearch.version}.zip
-
-    #elasticsearch.version=7.5.1
-    #elasticsearch.dir=${app.server.parent.dir}/elasticsearch-${elasticsearch.version}
-    #elasticsearch.analysis-icu.zip.name=analysis-icu-${elasticsearch.version}.zip
-    #elasticsearch.analysis-icu.zip.url=https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/${elasticsearch.analysis-icu.zip.name}
-    #elasticsearch.analysis-kuromoji.zip.name=analysis-kuromoji-${elasticsearch.version}.zip
-    #elasticsearch.analysis-kuromoji.zip.url=https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-kuromoji/${elasticsearch.analysis-kuromoji.zip.name}
-    #elasticsearch.analysis-smartcn.zip.name=analysis-smartcn-${elasticsearch.version}.zip
-    #elasticsearch.analysis-smartcn.zip.url=https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-smartcn/${elasticsearch.analysis-smartcn.zip.name}
-    #elasticsearch.analysis-stempel.zip.name=analysis-stempel-${elasticsearch.version}.zip
-    #elasticsearch.analysis-stempel.zip.url=https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-stempel/${elasticsearch.analysis-stempel.zip.name}
-    #elasticsearch.tar.name.linux=elasticsearch-${elasticsearch.version}-linux-x86_64.tar.gz
-    #elasticsearch.tar.name.mac=elasticsearch-${elasticsearch.version}-darwin-x86_64.tar.gz
-    #elasticsearch.zip.name.windows=elasticsearch-${elasticsearch.version}-windows-x86_64.zip
-    #elasticsearch.tar.url.linux=https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.tar.name.linux}
-    #elasticsearch.tar.url.mac=https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.tar.name.mac}
-    #elasticsearch.zip.url.windows=https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch.zip.name.windows}
-
 ##
 ## Email Addresses and Passwords
 ##