LRQA-56378 Rename testcase property

g-vijayvergia · Apr 3, 2020 · 912affb · 912affb
1 parent a65b5eb
commit 912affb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/build-test-elasticsearch7.xml b/build-test-elasticsearch7.xml
@@ -1317,10 +1317,10 @@ xpack.monitoring.collection.enabled: true</echo>
 
 		<antcall target="configure-elasticsearch-cluster-properties" />
 
-		<get-testcase-property property.name="remote.elasticsearch.ccr.enabled" />
+		<get-testcase-property property.name="remote.elasticsearch.clusters.enabled" />
 
 		<if>
-			<equals arg1="${remote.elasticsearch.ccr.enabled}" arg2="true" />
+			<equals arg1="${remote.elasticsearch.clusters.enabled}" arg2="true" />
 			<then>
 				<antcall target="prepare-additional-elasticsearch-dirs">
 					<param name="remote.elasticsearch.cluster.size" value="2" />
@@ -1375,7 +1375,7 @@ xpack.monitoring.collection.enabled: true</echo>
 					<print-file file.name="${elasticsearch.dir}-${elasticsearch.node.number}/logs/LiferayElasticsearchCluster.log" />
 
 					<if>
-						<equals arg1="${remote.elasticsearch.ccr.enabled}" arg2="true" />
+						<equals arg1="${remote.elasticsearch.clusters.enabled}" arg2="true" />
 						<then>
 							<waitfor maxwait="30" maxwaitunit="second" timeoutproperty="elasticsearch.server.not.started">
 								<http url="http://localhost:9202/" />
@@ -1390,7 +1390,7 @@ xpack.monitoring.collection.enabled: true</echo>
 		</if>
 
 		<if>
-			<equals arg1="${remote.elasticsearch.ccr.enabled}" arg2="true" />
+			<equals arg1="${remote.elasticsearch.clusters.enabled}" arg2="true" />
 			<then>
 				<start-ccr-trial />
 			</then>
@@ -1405,10 +1405,10 @@ xpack.monitoring.collection.enabled: true</echo>
 
 			<get-java-jdk-home />
 
-			<get-testcase-property property.name="remote.elasticsearch.ccr.enabled" />
+			<get-testcase-property property.name="remote.elasticsearch.clusters.enabled" />
 
 			<if>
-				<equals arg1="${remote.elasticsearch.ccr.enabled}" arg2="true" />
+				<equals arg1="${remote.elasticsearch.clusters.enabled}" arg2="true" />
 				<then>
 					<configure-elasticsearch7-test-properties />
 				</then>

diff --git a/...feray/portalweb/tests/coreinfrastructureee/search/elasticsearch/Elasticsearch7EE.testcase b/...feray/portalweb/tests/coreinfrastructureee/search/elasticsearch/Elasticsearch7EE.testcase
@@ -36,7 +36,7 @@ definition {
 		property osgi.module.configuration.file.names = "com.liferay.portal.bundle.blacklist.internal.BundleBlacklistConfiguration.config";
 		property osgi.module.configurations = "blacklistBundleSymbolicNames=&quot;com.liferay.portal.mobile.device.detection.fiftyonedegrees.api,com.liferay.portal.mobile.device.detection.fiftyonedegrees.enterprise,com.liferay.portal.mobile.device.detection.fiftyonedegrees.enterprise.test.data,com.liferay.portal.mobile.device.detection.fiftyonedegrees,com.liferay.portal.search.elasticsearch6.impl,com.liferay.portal.search.elasticsearch6.spi,com.liferay.portal.search.elasticsearch6.api,com.liferay.portal.search.elasticsearch6.xpack.security.impl,com.liferay.portal.search.elasticsearch6.xpack.monitoring.web,com.liferay.portal.search.tuning.rankings.web&quot;";
 		property portal.upstream = "quarantine";
-		property remote.elasticsearch.ccr.enabled = "true";
+		property remote.elasticsearch.clusters.enabled = "true";
 		property remote.elasticsearch.enabled = "true";
 		property test.name.skip.portal.instance = "Elasticsearch7EE#AssertReplicationAfterReindex";
 
@@ -841,7 +841,7 @@ definition {
 		property osgi.module.configuration.file.names = "com.liferay.portal.bundle.blacklist.internal.BundleBlacklistConfiguration.config";
 		property osgi.module.configurations = "blacklistBundleSymbolicNames=&quot;com.liferay.portal.mobile.device.detection.fiftyonedegrees.api,com.liferay.portal.mobile.device.detection.fiftyonedegrees.enterprise,com.liferay.portal.mobile.device.detection.fiftyonedegrees.enterprise.test.data,com.liferay.portal.mobile.device.detection.fiftyonedegrees,com.liferay.portal.search.elasticsearch6.impl,com.liferay.portal.search.elasticsearch6.spi,com.liferay.portal.search.elasticsearch6.api,com.liferay.portal.search.elasticsearch6.xpack.security.impl,com.liferay.portal.search.elasticsearch6.xpack.monitoring.web,com.liferay.portal.search.tuning.rankings.web&quot;";
 		property portal.upstream = "quarantine";
-		property remote.elasticsearch.ccr.enabled = "true";
+		property remote.elasticsearch.clusters.enabled = "true";
 		property remote.elasticsearch.enabled = "true";
 		property test.name.skip.portal.instance = "Elasticsearch7EE#CrossClusterReplicationSmoke";