remove xdc and only keep ndc

cadence-workflow · Sep 22, 2020 · e8256f7 · e8256f7
1 parent 61feb36
commit e8256f7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 81 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -31,21 +31,6 @@ steps:
           run: integration-test-cassandra
           config: docker/buildkite/docker-compose.yml
 
-  - label: ":golang: integration xdc test with cassandra"
-    agents:
-      queue: "workers"
-      docker: "*"
-    command: "make cover_xdc_profile"
-    artifact_paths:
-      - "build/coverage/*.out"
-    retry:
-      automatic:
-        limit: 1
-    plugins:
-      - docker-compose#v3.0.0:
-          run: integration-test-xdc-cassandra
-          config: docker/buildkite/docker-compose.yml
-
   - label: ":golang: integration ndc test with cassandra"
     agents:
       queue: "workers"
@@ -58,7 +43,7 @@ steps:
         limit: 1
     plugins:
       - docker-compose#v3.0.0:
-          run: integration-test-xdc-cassandra
+          run: integration-test-ndc-cassandra
           config: docker/buildkite/docker-compose.yml
 
   - label: ":golang: integration test with mysql"
@@ -76,21 +61,6 @@ steps:
           run: integration-test-mysql
           config: docker/buildkite/docker-compose.yml
 
-  - label: ":golang: integration xdc test with mysql"
-    agents:
-      queue: "workers"
-      docker: "*"
-    command: "make cover_xdc_profile"
-    artifact_paths:
-      - "build/coverage/*.out"
-    retry:
-      automatic:
-        limit: 1
-    plugins:
-      - docker-compose#v3.0.0:
-          run: integration-test-xdc-mysql
-          config: docker/buildkite/docker-compose.yml
-
   - label: ":golang: integration ndc test with mysql"
     agents:
       queue: "workers"
@@ -103,7 +73,7 @@ steps:
         limit: 1
     plugins:
       - docker-compose#v3.0.0:
-          run: integration-test-xdc-mysql
+          run: integration-test-ndc-mysql
           config: docker/buildkite/docker-compose.yml
 
   - label: ":golang: integration test with postgres"
@@ -121,21 +91,6 @@ steps:
           run: integration-test-postgres
           config: docker/buildkite/docker-compose.yml
 
-  - label: ":golang: integration xdc test with postgres"
-    agents:
-      queue: "workers"
-      docker: "*"
-    command: "make cover_xdc_profile"
-    artifact_paths:
-      - "build/coverage/*.out"
-    retry:
-      automatic:
-        limit: 1
-    plugins:
-      - docker-compose#v3.0.0:
-          run: integration-test-xdc-postgres
-          config: docker/buildkite/docker-compose.yml
-
   - label: ":golang: integration ndc test with postgres"
     agents:
       queue: "workers"
@@ -148,7 +103,7 @@ steps:
         limit: 1
     plugins:
       - docker-compose#v3.0.0:
-          run: integration-test-xdc-postgres
+          run: integration-test-ndc-postgres
           config: docker/buildkite/docker-compose.yml
 
   - wait

diff --git a/Makefile b/Makefile
@@ -96,11 +96,6 @@ INTEG_COVER_FILE_CASS           := $(COVER_ROOT)/integ_cassandra__cover.out
 INTEG_COVER_FILE_MYSQL          := $(COVER_ROOT)/integ_sql_mysql_cover.out
 INTEG_COVER_FILE_POSTGRES       := $(COVER_ROOT)/integ_sql_postgres_cover.out
 
-INTEG_XDC_COVER_FILE            := $(COVER_ROOT)/integ_xdc_$(PERSISTENCE_TYPE)_$(PERSISTENCE_PLUGIN)_cover.out
-INTEG_XDC_COVER_FILE_CASS       := $(COVER_ROOT)/integ_xdc_cassandra__cover.out
-INTEG_XDC_COVER_FILE_MYSQL      := $(COVER_ROOT)/integ_xdc_sql_mysql_cover.out
-INTEG_XDC_COVER_FILE_POSTGRES   := $(COVER_ROOT)/integ_xdc_sql_postgres_cover.out
-
 INTEG_NDC_COVER_FILE            := $(COVER_ROOT)/integ_ndc_$(PERSISTENCE_TYPE)_$(PERSISTENCE_PLUGIN)_cover.out
 INTEG_NDC_COVER_FILE_CASS       := $(COVER_ROOT)/integ_ndc_cassandra__cover.out
 INTEG_NDC_COVER_FILE_MYSQL      := $(COVER_ROOT)/integ_ndc_sql_mysql_cover.out
@@ -220,16 +215,6 @@ cover_integration_profile: clean bins_nothrift
 	@time go test $(INTEG_TEST_ROOT) $(TEST_ARG) $(TEST_TAG) -persistenceType=$(PERSISTENCE_TYPE) -sqlPluginName=$(PERSISTENCE_PLUGIN) $(GOCOVERPKG_ARG) -coverprofile=$(BUILD)/$(INTEG_TEST_DIR)/coverage.out || exit 1;
 	@cat $(BUILD)/$(INTEG_TEST_DIR)/coverage.out | grep -v "^mode: \w\+" >> $(INTEG_COVER_FILE)
 
-cover_xdc_profile: clean bins_nothrift
-	@mkdir -p $(BUILD)
-	@mkdir -p $(COVER_ROOT)
-	@echo "mode: atomic" > $(INTEG_XDC_COVER_FILE)
-
-	@echo Running integration test for cross dc with $(PERSISTENCE_TYPE) $(PERSISTENCE_PLUGIN)
-	@mkdir -p $(BUILD)/$(INTEG_TEST_XDC_DIR)
-	@time go test -v -timeout $(TEST_TIMEOUT) $(INTEG_TEST_XDC_ROOT) $(TEST_TAG) -persistenceType=$(PERSISTENCE_TYPE) -sqlPluginName=$(PERSISTENCE_PLUGIN) $(GOCOVERPKG_ARG) -coverprofile=$(BUILD)/$(INTEG_TEST_XDC_DIR)/coverage.out || exit 1;
-	@cat $(BUILD)/$(INTEG_TEST_XDC_DIR)/coverage.out | grep -v "^mode: \w\+" | grep -v "mode: set" >> $(INTEG_XDC_COVER_FILE)
-
 cover_ndc_profile: clean bins_nothrift
 	@mkdir -p $(BUILD)
 	@mkdir -p $(COVER_ROOT)
@@ -240,15 +225,12 @@ cover_ndc_profile: clean bins_nothrift
 	@time go test -v -timeout $(TEST_TIMEOUT) $(INTEG_TEST_NDC_ROOT) $(TEST_TAG) -persistenceType=$(PERSISTENCE_TYPE) -sqlPluginName=$(PERSISTENCE_PLUGIN) $(GOCOVERPKG_ARG) -coverprofile=$(BUILD)/$(INTEG_TEST_NDC_DIR)/coverage.out -count=$(TEST_RUN_COUNT) || exit 1;
 	@cat $(BUILD)/$(INTEG_TEST_NDC_DIR)/coverage.out | grep -v "^mode: \w\+" | grep -v "mode: set" >> $(INTEG_NDC_COVER_FILE)
 
-$(COVER_ROOT)/cover.out: $(UNIT_COVER_FILE) $(INTEG_COVER_FILE_CASS) $(INTEG_COVER_FILE_MYSQL) $(INTEG_COVER_FILE_POSTGRES) $(INTEG_XDC_COVER_FILE_CASS) $(INTEG_XDC_COVER_FILE_MYSQL) $(INTEG_XDC_COVER_FILE_POSTGRES) $(INTEG_NDC_COVER_FILE_CASS) $(INTEG_NDC_COVER_FILE_MYSQL) $(INTEG_NDC_COVER_FILE_POSTGRES)
+$(COVER_ROOT)/cover.out: $(UNIT_COVER_FILE) $(INTEG_COVER_FILE_CASS) $(INTEG_COVER_FILE_MYSQL) $(INTEG_COVER_FILE_POSTGRES) $(INTEG_NDC_COVER_FILE_CASS) $(INTEG_NDC_COVER_FILE_MYSQL) $(INTEG_NDC_COVER_FILE_POSTGRES)
 	@echo "mode: atomic" > $(COVER_ROOT)/cover.out
 	cat $(UNIT_COVER_FILE) | grep -v "^mode: \w\+" | grep -vP ".gen|[Mm]ock[s]?" >> $(COVER_ROOT)/cover.out
 	cat $(INTEG_COVER_FILE_CASS) | grep -v "^mode: \w\+" | grep -vP ".gen|[Mm]ock[s]?" >> $(COVER_ROOT)/cover.out
 	cat $(INTEG_COVER_FILE_MYSQL) | grep -v "^mode: \w\+" | grep -vP ".gen|[Mm]ock[s]?" >> $(COVER_ROOT)/cover.out
 	cat $(INTEG_COVER_FILE_POSTGRES) | grep -v "^mode: \w\+" | grep -vP ".gen|[Mm]ock[s]?" >> $(COVER_ROOT)/cover.out
-	cat $(INTEG_XDC_COVER_FILE_CASS) | grep -v "^mode: \w\+" | grep -vP ".gen|[Mm]ock[s]?" >> $(COVER_ROOT)/cover.out
-    cat $(INTEG_XDC_COVER_FILE_MYSQL) | grep -v "^mode: \w\+" | grep -vP ".gen|[Mm]ock[s]?" >> $(COVER_ROOT)/cover.out
-    cat $(INTEG_XDC_COVER_FILE_POSTGRES) | grep -v "^mode: \w\+" | grep -vP ".gen|[Mm]ock[s]?" >> $(COVER_ROOT)/cover.out
     cat $(INTEG_NDC_COVER_FILE_CASS) | grep -v "^mode: \w\+" | grep -vP ".gen|[Mm]ock[s]?" >> $(COVER_ROOT)/cover.out
 	cat $(INTEG_NDC_COVER_FILE_MYSQL) | grep -v "^mode: \w\+" | grep -vP ".gen|[Mm]ock[s]?" >> $(COVER_ROOT)/cover.out
 	cat $(INTEG_NDC_COVER_FILE_POSTGRES) | grep -v "^mode: \w\+" | grep -vP ".gen|[Mm]ock[s]?" >> $(COVER_ROOT)/cover.out

diff --git a/docker/buildkite/README.md b/docker/buildkite/README.md
@@ -23,7 +23,7 @@ docker-compose -f docker/buildkite/docker-compose-local.yml build integration-te
 
 cross DC integration tests:
 ```bash
-docker-compose -f docker/buildkite/docker-compose-local.yml build integration-test-xdc-cassandra
+docker-compose -f docker/buildkite/docker-compose-local.yml build integration-test-ndc-cassandra
 ```
 
 Run the integration tests:
@@ -40,7 +40,7 @@ docker-compose -f docker/buildkite/docker-compose-local.yml run integration-test
 
 cross DC integration tests:
 ```bash
-docker-compose -f docker/buildkite/docker-compose-local.yml run integration-test-xdc-cassandra
+docker-compose -f docker/buildkite/docker-compose-local.yml run integration-test-ndc-cassandra
 ```
 
 Note that BuildKite will run basically the same commands.

diff --git a/docker/buildkite/docker-compose-local.yml b/docker/buildkite/docker-compose-local.yml
@@ -226,7 +226,7 @@ services:
         aliases:
           - integration-test
 
-  integration-test-xdc-cassandra:
+  integration-test-ndc-cassandra:
     build:
       context: ../../
       dockerfile: ./docker/buildkite/Dockerfile
@@ -235,7 +235,7 @@ services:
       - -e
       - -c
       - |
-        make cover_xdc_profile
+        make cover_ndc_profile
     ports:
       - "7933:7933"
       - "7934:7934"
@@ -255,9 +255,9 @@ services:
     networks:
       services-network:
         aliases:
-          - integration-test-xdc
+          - integration-test-ndc
 
-  integration-test-xdc-mysql:
+  integration-test-ndc-mysql:
     build:
       context: ../../
       dockerfile: ./docker/buildkite/Dockerfile
@@ -266,7 +266,7 @@ services:
       - -e
       - -c
       - |
-        make cover_xdc_profile
+        make cover_ndc_profile
     ports:
       - "7933:7933"
       - "7934:7934"
@@ -287,7 +287,7 @@ services:
     networks:
       services-network:
         aliases:
-          - integration-test-xdc
+          - integration-test-ndc
 
 networks:
   services-network:

diff --git a/docker/buildkite/docker-compose.yml b/docker/buildkite/docker-compose.yml
@@ -162,7 +162,7 @@ services:
         aliases:
           - integration-test
 
-  integration-test-xdc-cassandra:
+  integration-test-ndc-cassandra:
     build:
       context: ../../
       dockerfile: ./docker/buildkite/Dockerfile
@@ -186,9 +186,9 @@ services:
     networks:
       services-network:
         aliases:
-          - integration-test-xdc
+          - integration-test-ndc
 
-  integration-test-xdc-mysql:
+  integration-test-ndc-mysql:
     build:
       context: ../../
       dockerfile: ./docker/buildkite/Dockerfile
@@ -213,9 +213,9 @@ services:
     networks:
       services-network:
         aliases:
-          - integration-test-xdc
+          - integration-test-ndc
 
-  integration-test-xdc-postgres:
+  integration-test-ndc-postgres:
     build:
       context: ../../
       dockerfile: ./docker/buildkite/Dockerfile
@@ -240,7 +240,7 @@ services:
     networks:
       services-network:
         aliases:
-          - integration-test-xdc
+          - integration-test-ndc
 
   coverage-report:
     build: