Enable Elasticsearch functional tests for SQL advanced visibility (#3923)

* Enable Elasticsearch functional tests for SQL advanced visibility

* Cleanup cluster configs

* Disable cyclomatic and cognitive linter rules for tests dir

Author: alexshtin

.golangci.yml

@@ -82,3 +82,9 @@ linters-settings:
       - name: unhandled-error
         arguments:
           - "fmt.Printf"
+issues:
+  exclude-rules:
+    - path: tests\/.+\.go
+      text: "(cyclomatic|cognitive)"
+      linters:
+        - revive

Makefile

@@ -264,7 +264,7 @@ clean-test-results:
 
 build-tests:
 	@printf $(COLOR) "Build tests..."
-	@go test -exec="true" -count=0 -tags=esintegration $(TEST_DIRS)
+	@go test -exec="true" -count=0 $(TEST_DIRS)
 
 unit-test: clean-test-results
 	@printf $(COLOR) "Run unit tests..."
@@ -278,18 +278,18 @@ integration-test: clean-test-results
 
 functional-test: clean-test-results
 	@printf $(COLOR) "Run functional tests..."
-	@go test $(FUNCTIONAL_TEST_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -race | tee -a test.log
-	@go test $(FUNCTIONAL_TEST_NDC_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -race | tee -a test.log
+	@go test $(FUNCTIONAL_TEST_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -race -persistenceType=$(PERSISTENCE_TYPE) -persistenceDriver=$(PERSISTENCE_DRIVER) | tee -a test.log
+	@go test $(FUNCTIONAL_TEST_NDC_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -race -persistenceType=$(PERSISTENCE_TYPE) -persistenceDriver=$(PERSISTENCE_DRIVER) | tee -a test.log
 # Need to run xdc tests with race detector off because of ringpop bug causing data race issue.
-	@go test $(FUNCTIONAL_TEST_XDC_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) | tee -a test.log
+	@go test $(FUNCTIONAL_TEST_XDC_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -persistenceType=$(PERSISTENCE_TYPE) -persistenceDriver=$(PERSISTENCE_DRIVER) | tee -a test.log
 	@! grep -q "^--- FAIL" test.log
 
 functional-with-fault-injection-test: clean-test-results
 	@printf $(COLOR) "Run integration tests with fault injection..."
-	@go test $(FUNCTIONAL_TEST_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -race  -PersistenceFaultInjectionRate=0.005 | tee -a test.log
-	@go test $(FUNCTIONAL_TEST_NDC_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -race  -PersistenceFaultInjectionRate=0.005 | tee -a test.log
+	@go test $(FUNCTIONAL_TEST_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -race -PersistenceFaultInjectionRate=0.005 -persistenceType=$(PERSISTENCE_TYPE) -persistenceDriver=$(PERSISTENCE_DRIVER) | tee -a test.log
+	@go test $(FUNCTIONAL_TEST_NDC_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -race -PersistenceFaultInjectionRate=0.005 -persistenceType=$(PERSISTENCE_TYPE) -persistenceDriver=$(PERSISTENCE_DRIVER) | tee -a test.log
 # Need to run xdc tests with race detector off because of ringpop bug causing data race issue.
-	@go test $(FUNCTIONAL_TEST_XDC_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -PersistenceFaultInjectionRate=0.005 | tee -a test.log
+	@go test $(FUNCTIONAL_TEST_XDC_ROOT) -timeout=$(TEST_TIMEOUT) $(TEST_TAG) -PersistenceFaultInjectionRate=0.005 -persistenceType=$(PERSISTENCE_TYPE) -persistenceDriver=$(PERSISTENCE_DRIVER) | tee -a test.log
 	@! grep -q "^--- FAIL" test.log
 
 test: unit-test integration-test functional-test functional-with-fault-injection-test

develop/buildkite/docker-compose-es8.yml

@@ -56,7 +56,6 @@ services:
       - "ES_VERSION=v8"
       - "PERSISTENCE_TYPE=nosql"
       - "PERSISTENCE_DRIVER=cassandra"
-      - "TEST_TAG=esintegration"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
       - BUILDKITE_JOB_ID

develop/buildkite/docker-compose.yml

@@ -93,7 +93,6 @@ services:
       - "ES_VERSION=v7"
       - "PERSISTENCE_TYPE=nosql"
       - "PERSISTENCE_DRIVER=cassandra"
-      - "TEST_TAG=esintegration"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
       - BUILDKITE_JOB_ID
@@ -120,7 +119,6 @@ services:
       - "ES_VERSION=v7"
       - "PERSISTENCE_TYPE=sql"
       - "PERSISTENCE_DRIVER=mysql"
-      - "TEST_TAG=esintegration"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
       - BUILDKITE_JOB_ID
@@ -143,19 +141,15 @@ services:
       dockerfile: ./develop/buildkite/Dockerfile
     environment:
       - "MYSQL_SEEDS=mysql"
-      - "ES_SEEDS=elasticsearch"
-      - "ES_VERSION=v7"
       - "PERSISTENCE_TYPE=sql"
       - "PERSISTENCE_DRIVER=mysql8"
-      - "TEST_TAG=esintegration"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
       - BUILDKITE_JOB_ID
       - BUILDKITE_BUILD_ID
       - BUILDKITE_BUILD_NUMBER
     depends_on:
       - mysql
-      - elasticsearch
     volumes:
       - ../..:/temporal
       - /usr/bin/buildkite-agent:/usr/bin/buildkite-agent
@@ -174,7 +168,6 @@ services:
       - "ES_VERSION=v7"
       - "PERSISTENCE_TYPE=sql"
       - "PERSISTENCE_DRIVER=postgres"
-      - "TEST_TAG=esintegration"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
       - BUILDKITE_JOB_ID
@@ -197,19 +190,15 @@ services:
       dockerfile: ./develop/buildkite/Dockerfile
     environment:
       - "POSTGRES_SEEDS=postgresql"
-      - "ES_SEEDS=elasticsearch"
-      - "ES_VERSION=v7"
       - "PERSISTENCE_TYPE=sql"
       - "PERSISTENCE_DRIVER=postgres12"
-      - "TEST_TAG=esintegration"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
       - BUILDKITE_JOB_ID
       - BUILDKITE_BUILD_ID
       - BUILDKITE_BUILD_NUMBER
     depends_on:
       - postgresql
-      - elasticsearch
     volumes:
       - ../..:/temporal
       - /usr/bin/buildkite-agent:/usr/bin/buildkite-agent
@@ -248,7 +237,6 @@ services:
       - "ES_VERSION=v7"
       - "PERSISTENCE_TYPE=nosql"
       - "PERSISTENCE_DRIVER=cassandra"
-      - "TEST_TAG=esintegration"
       - "TEST_RUN_COUNT=10"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
@@ -276,7 +264,6 @@ services:
       - "ES_VERSION=v7"
       - "PERSISTENCE_TYPE=sql"
       - "PERSISTENCE_DRIVER=mysql"
-      - "TEST_TAG=esintegration"
       - "TEST_RUN_COUNT=10"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
@@ -300,11 +287,8 @@ services:
       dockerfile: ./develop/buildkite/Dockerfile
     environment:
       - "MYSQL_SEEDS=mysql"
-      - "ES_SEEDS=elasticsearch"
-      - "ES_VERSION=v7"
       - "PERSISTENCE_TYPE=sql"
       - "PERSISTENCE_DRIVER=mysql8"
-      - "TEST_TAG=esintegration"
       - "TEST_RUN_COUNT=10"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
@@ -313,7 +297,6 @@ services:
       - BUILDKITE_BUILD_NUMBER
     depends_on:
       - mysql
-      - elasticsearch
     volumes:
       - ../..:/temporal
       - /usr/bin/buildkite-agent:/usr/bin/buildkite-agent
@@ -332,7 +315,6 @@ services:
       - "ES_VERSION=v7"
       - "PERSISTENCE_TYPE=sql"
       - "PERSISTENCE_DRIVER=postgres"
-      - "TEST_TAG=esintegration"
       - "TEST_RUN_COUNT=10"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
@@ -356,11 +338,8 @@ services:
       dockerfile: ./develop/buildkite/Dockerfile
     environment:
       - "POSTGRES_SEEDS=postgresql"
-      - "ES_SEEDS=elasticsearch"
-      - "ES_VERSION=v7"
       - "PERSISTENCE_TYPE=sql"
       - "PERSISTENCE_DRIVER=postgres12"
-      - "TEST_TAG=esintegration"
       - "TEST_RUN_COUNT=10"
       - "TEMPORAL_VERSION_CHECK_DISABLED=1"
       - BUILDKITE_AGENT_ACCESS_TOKEN
@@ -369,7 +348,6 @@ services:
       - BUILDKITE_BUILD_NUMBER
     depends_on:
       - postgresql
-      - elasticsearch
     volumes:
       - ../..:/temporal
       - /usr/bin/buildkite-agent:/usr/bin/buildkite-agent