SEARCH-1560: combine IE and SS upgrade in one build plan

e2e-test/.gitignore

@@ -35,3 +35,4 @@ qa/search/backup/host-bkp_T0
 image-digests.txt
 qa/search/upgrade/solr-data
 qa/search/upgrade/solr-contentstore
+qa/upgrade/upgrade

e2e-test/qa/upgrade/.env

@@ -0,0 +1,15 @@
+# docker-compose related environments
+ALFRESCO_IMAGE=alfresco/alfresco-content-repository
+ALFRESCO_TAG=6.1.0-EA3
+SHARE_IMAGE=alfresco/alfresco-share
+SHARE_TAG=6.0
+POSTGRES_IMAGE=postgres
+POSTGRES_TAG=10.1
+SEARCH_IMAGE=quay.io/alfresco/search-services
+SEARCH_TAG=latest
+DIST_DIR_PATH=/opt/alfresco-search-services
+#SEARCH_IMAGE=quay.io/alfresco/insight-engine
+#SEARCH_TAG=lates
+#DIST_DIR_PATH=/opt/alfresco-insight-engine
+ACTIVEMQ_IMAGE=alfresco/alfresco-activemq
+ACTIVEMQ_TAG=5.15.6

e2e-test/qa/upgrade/Makefile

@@ -0,0 +1,39 @@
+include ../Makefile
+include .env
+
+# CURRENT_DIR is the folder where this Makefile is saved
+CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+
+SEARCH_IMAGE ?=quay.io/alfresco/search-services
+SEARCH_TAG ?=latest # default version that will be used in tasks
+
+as-previous: clean ## 1 - install the previous version: $ make SEARCH_IMAGE=quay.io/alfresco/search-services SEARCH_TAG=1.2.1 as-previous
+	rm -rf ./solr-data && \
+	rm -rf ./solr-contentstore && \
+	rm -f ./image-digests.txt && \
+	export SEARCH_TAG=$(SEARCH_TAG) && \
+	export SEARCH_IMAGE=$(SEARCH_IMAGE) && \
+	$(dc) pull && \
+	echo "\n====Previous====" > image-digests.txt && \
+	$(dc) config --resolve-image-digests >> image-digests.txt && \
+	$(dc) up -d && \
+	docker ps 
+
+as-current: ## 2 - upgrade previous to this version $ make SEARCH_IMAGE=quay.io/alfresco/search-services SEARCH_TAG=2.0.x as-current
+	$(dc) kill search && \
+	$(dc) rm -f search && \
+	export SEARCH_TAG=$(SEARCH_TAG) && \
+	export SEARCH_IMAGE=$(SEARCH_IMAGE) && \
+	$(dc) pull search && \
+	echo "\n====Current====" >> image-digests.txt && \
+	$(dc) config --resolve-image-digests >> image-digests.txt && \
+	$(dc) up -d search  && \
+	docker ps 
+# 
+# Run the following commands if you need to test the upgrade e2e
+#
+#make SEARCH_IMAGE=quay.io/alfresco/search-services SEARCH_TAG=1.2.1 as-previous wait
+#make run-mvn-tests suiteXmlFile=./src/test/resources/search-pre-upgrade-suite.xml
+
+#make SEARCH_IMAGE=quay.io/alfresco/search-services SEARCH_TAG=2.0.x as-current wait
+#make run-mvn-tests suiteXmlFile=./src/test/resources/search-post-upgrade-suite.xml

e2e-test/qa/upgrade/docker-compose.yml

@@ -0,0 +1,66 @@
+version: '3'
+services:
+  alfresco:
+    image: ${ALFRESCO_IMAGE}:${ALFRESCO_TAG}
+    environment:
+      JAVA_OPTS : "
+        -Ddb.driver=org.postgresql.Driver
+        -Ddb.username=alfresco
+        -Ddb.password=alfresco
+        -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
+        -Dsolr.host=search
+        -Dsolr.port=8983
+        -Dsolr.secureComms=none
+        -Dsolr.base.url=/solr
+        -Dindex.subsystem.name=solr6
+        -Dalfresco.restApi.basicAuthScheme=true
+        -Ddeployment.method=DOCKER_COMPOSE
+        -Dcsrf.filter.enabled=false
+        -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
+        "
+    ports:
+      - "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi
+      - "5005:5005" #Java debugging
+      - "8081:8080" #Browser port for Alfresco
+
+  share:
+    image: ${SHARE_IMAGE}:${SHARE_TAG}
+    environment:
+      - REPO_HOST=alfresco
+      - REPO_PORT=8080
+    ports:
+      - 8082:8080 #Browser port for Share
+
+  postgres:
+    image: ${POSTGRES_IMAGE}:${POSTGRES_TAG}
+    environment:
+      - POSTGRES_PASSWORD=alfresco
+      - POSTGRES_USER=alfresco
+      - POSTGRES_DB=alfresco
+    ports:
+      - 5432:5432
+
+  search:
+    image: ${SEARCH_IMAGE}:${SEARCH_TAG}
+    environment:
+      #Solr needs to know how to register itself with Alfresco
+      - SOLR_ALFRESCO_HOST=alfresco
+      - SOLR_ALFRESCO_PORT=8080
+      #Alfresco needs to know how to call solr
+      - SOLR_SOLR_HOST=search
+      - SOLR_SOLR_PORT=8983
+      #Create the default alfresco and archive cores
+      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+    ports:
+      - 8083:8983 #Browser port
+    volumes: 
+      - "./upgrade/solr-data:${DIST_DIR_PATH}/data"
+      - "./upgrade/solr-contentstore:/opt/${DIST_DIR_PATH}/contentstore"  
+      
+  activemq:
+    image: ${ACTIVEMQ_IMAGE}:${ACTIVEMQ_TAG}
+    ports:
+      - 8161:8161 # Web Console
+      - 5672:5672 # AMQP
+      - 61616:61616 # OpenWire
+      - 61613:61613 # STOMP