LRQA-56124 Sort elasticsearch6 alphabetically

g-vijayvergia · Mar 11, 2020 · cb77e9a · cb77e9a
1 parent 1168aa6
commit cb77e9a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/build-test-elasticsearch6.xml b/build-test-elasticsearch6.xml
@@ -693,9 +693,9 @@ xpack.monitoring.collection.enabled: true</echo>
 								{ "match": { "userName": "test test" } }
 							],
 							"must_not": [
-								{ "match": { "hidden": "true" } },
+								{ "match": { "entryClassName": "com.liferay.calendar.model.Calendar" } },
 								{ "match": { "entryClassName": "com.liferay.portal.kernel.model.Layout" } },
-								{ "match": { "entryClassName": "com.liferay.calendar.model.Calendar" } }
+								{ "match": { "hidden": "true" } }
 							]
 						}
 					}
@@ -704,9 +704,9 @@ xpack.monitoring.collection.enabled: true</echo>
 		</property>
 
 		<exec executable="curl" outputproperty="curl.output.elasticsearch.indices">
-			<arg value="localhost:9200/liferay-${companyId}/_search?pretty" />
 			<arg value="-H" />
 			<arg value="Content-Type: application/json" />
+			<arg value="localhost:9200/liferay-${companyId}/_search?pretty" />
 			<arg value="-d" />
 			<arg value="${elasticsearch.print.query}" />
 		</exec>
@@ -733,11 +733,11 @@ xpack.monitoring.collection.enabled: true</echo>
 		</property>
 
 		<exec executable="curl" outputproperty="curl.output">
+			<arg value="-H" />
+			<arg value="Content-Type: application/json" />
 			<arg value="-X" />
 			<arg value="PUT" />
 			<arg value="localhost:${elasticsearch.port}/_snapshot/my_backup" />
-			<arg value="-H" />
-			<arg value="Content-Type: application/json" />
 			<arg value="-d" />
 			<arg value="${register.repository}" />
 		</exec>
@@ -747,8 +747,8 @@ xpack.monitoring.collection.enabled: true</echo>
 		<property name="restore.repository">
 			<![CDATA[
 				{
-					"indices": "${backup.index}",
 					"ignore_unavailable": true,
+					"indices": "${backup.index}",
 					"include_global_state": true,
 					"rename_pattern": "index_(.+)",
 					"rename_replacement": "restored_index_$1"
@@ -757,11 +757,11 @@ xpack.monitoring.collection.enabled: true</echo>
 		</property>
 
 		<exec executable="curl" outputproperty="curl.output">
+			<arg value="-H" />
+			<arg value="Content-Type: application/json" />
 			<arg value="-X" />
 			<arg value="POST" />
 			<arg value="localhost:${elasticsearch.port}/_snapshot/my_backup/snapshot_2/_restore" />
-			<arg value="-H" />
-			<arg value="Content-Type: application/json" />
 			<arg value="-d" />
 			<arg value="${restore.repository}" />
 		</exec>