LRCI-1823 Rename container & image names to accommodate updates

build-test-analytics-cloud.xml

@@ -16,13 +16,13 @@
 
 			<replaceregexp
 				file="${analytics.cloud.docker.test.yaml}"
-				match="container_name: com-liferay-osb-faro-private"
+				match="container_name: faro"
 				replace="container_name: ${analytics.cloud.faro.container.name}"
 			/>
 
 			<replaceregexp
 				file="${analytics.cloud.docker.test.yaml}"
-				match="image: liferay\/com-liferay-osb-faro\:asah-local-latest"
+				match="image: liferay\/com-liferay-osb-faro\:latest"
 				replace="image: ${analytics.cloud.faro.image.name}"
 			/>
 
@@ -91,7 +91,7 @@ networks:
 			/>
 
 			<replaceregexp
-				file="${analytics.cloud.faro.dir}/osb-faro-docker/asah-local/Dockerfile"
+				file="${analytics.cloud.faro.dir}/osb-faro-docker/local/Dockerfile"
 				match="FARO_URL=http://localhost:8080"
 				replace="FARO_URL=${analytics.cloud.faro.frontend.url}"
 			/>
@@ -116,7 +116,7 @@ OSB_ASAH_PUBLISHER_URL=${analytics.cloud.asah.publisher.url}</echo>
 				<equals arg1="${analytics.cloud.faro.build}" arg2="true" />
 				<then>
 					<execute dir="${analytics.cloud.faro.dir}">
-						./gradlew createDocker -Pcom.liferay.osb.faro.environment.name=asah-local -Dliferay.ci=true
+						./gradlew createDocker -Pcom.liferay.osb.faro.environment.name=local -Dliferay.ci=true
 
 						docker rm ${analytics.cloud.faro.container.name}
 					</execute>

test.properties

@@ -25,14 +25,14 @@
         src/testIntegration/resources/features
 
     analytics.cloud.faro.build=true
-    analytics.cloud.faro.container.name=com-liferay-osb-faro-private
+    analytics.cloud.faro.container.name=faro
     analytics.cloud.faro.data.creator.api=1.0.4
     analytics.cloud.faro.data.creator.impl=1.0.7
     analytics.cloud.faro.data.csv=${analytics.cloud.faro.dir}/osb-faro-functional-test/src/testIntegration/resources/csv/ac-data-generator.csv
     analytics.cloud.faro.dir=../com-liferay-osb-faro-private
     analytics.cloud.faro.dxp.port=8081
     analytics.cloud.faro.frontend.url=http://osbfarofrontend:8080
-    analytics.cloud.faro.image.name=liferay/com-liferay-osb-faro:asah-local-latest
+    analytics.cloud.faro.image.name=liferay/com-liferay-osb-faro:latest
     analytics.cloud.faro.osgi.console.port=11312
     analytics.cloud.project.name=com-liferay-osb-asah-private