Merge branch 'master' of git.alfresco.com:search_discovery/insightengine into fix/SEARCH-1829

e2e-test/pom.xml

@@ -14,7 +14,9 @@
       <tas.rest.api.version>6.0.1.2</tas.rest.api.version>
       <tas.cmis.api.version>6.0.0.4</tas.cmis.api.version>
       <tas.utility.version>3.0.11</tas.utility.version>
-      <rm.version>2.6.0</rm.version>
+      <!-- GS V3.1-0 is not compatible with IE, but GS automation Artifacts V3.1-0 have been suggested to be used for GS-IE automation tests 
+      This version needs to be later updated with IE compatible GS version based on Alfresco 6.1.x -->
+      <rm.version>3.1.0</rm.version>
       <suiteXmlFile>src/test/resources/SearchSuite.xml</suiteXmlFile>
       <test.exclude></test.exclude>
       <test.include></test.include>
@@ -77,7 +79,7 @@
       </dependency>
       <dependency>
          <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-rm-automation-enterprise-rest-api</artifactId>
+         <artifactId>alfresco-governance-services-automation-enterprise-rest-api</artifactId>
          <version>${rm.version}</version>
          <scope>test</scope>
       </dependency>
@@ -88,7 +90,7 @@
        </dependency>
       <dependency>
          <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-rm-automation-community-rest-api</artifactId>
+         <artifactId>alfresco-governance-services-automation-community-rest-api</artifactId>
          <version>${rm.version}</version>
          <classifier>tests</classifier>
          <scope>test</scope>

e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetFieldsSearchTest.java

@@ -90,7 +90,7 @@ public class FacetFieldsSearchTest extends AbstractE2EFunctionalTest
         restClient.authenticateUser(testUser).withCoreAPI().usingNode(textFile).updateNode(putBody);
         
         // Wait for the file to be indexed
-        waitForIndexing(htmlFile.getName(), true);
+        waitForContentIndexing(htmlFile.getContent(), true);
     }
     
     @Test

search-services/packaging/src/docker/6.x/.env

@@ -1,6 +1,7 @@
 # In order to start the community edition set the value of ALFRESCO_IMAGE to alfresco/alfresco-content-repository-community
-ALFRESCO_IMAGE=alfresco/alfresco-content-repository
+ALFRESCO_IMAGE=quay.io/alfresco/alfresco-content-repository
 ALFRESCO_TAG=6.1.0-EA3
+SHARE_IMAGE=quay.io/alfresco/alfresco-share
 SHARE_TAG=6.0
 POSTGRES_TAG=10.1
 SEARCH_TAG=latest

search-services/packaging/src/docker/6.x/docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - "5005:5005" #Java debugging
       - "8081:8080" #Browser port for Alfresco
   share:
-    image: alfresco/alfresco-share:${SHARE_TAG}
+    image: ${SHARE_IMAGE}:${SHARE_TAG}
     environment:
       - REPO_HOST=alfresco
       - REPO_PORT=8080