diff --git a/develop/buildkite/docker-compose-os2.yml b/develop/buildkite/docker-compose-os2.yml new file mode 100644 index 00000000000..27cfa16fefd --- /dev/null +++ b/develop/buildkite/docker-compose-os2.yml @@ -0,0 +1,50 @@ +version: "3.5" + +services: + cassandra: + image: cassandra:3.11 + networks: + services-network: + aliases: + - cassandra + + opensearch: + image: opensearchproject/opensearch:2.6.0 + networks: + services-network: + aliases: + - opensearch + environment: + - discovery.type=single-node + - plugins.security.disabled=true + + integration-test-cassandra: + build: + context: ../.. + dockerfile: ./develop/buildkite/Dockerfile + environment: + - "CASSANDRA_SEEDS=cassandra" + - "ES_SEEDS=opensearch" + - "ES_VERSION=v8" + - "PERSISTENCE_TYPE=nosql" + - "PERSISTENCE_DRIVER=cassandra" + - "TEMPORAL_VERSION_CHECK_DISABLED=1" + - BUILDKITE_AGENT_ACCESS_TOKEN + - BUILDKITE_JOB_ID + - BUILDKITE_BUILD_ID + - BUILDKITE_BUILD_NUMBER + depends_on: + - cassandra + - opensearch + volumes: + - ../..:/temporal + - /usr/bin/buildkite-agent:/usr/bin/buildkite-agent + networks: + services-network: + aliases: + - integration-test + +networks: + services-network: + name: services-network + driver: bridge diff --git a/develop/buildkite/pipeline.yml b/develop/buildkite/pipeline.yml index 70ca28d6477..ae5bb069a0e 100644 --- a/develop/buildkite/pipeline.yml +++ b/develop/buildkite/pipeline.yml @@ -65,6 +65,21 @@ steps: run: integration-test-cassandra config: ./develop/buildkite/docker-compose-es8.yml + - label: ":golang: functional test with cassandra (OpenSearch 2)" + agents: + queue: "default" + docker: "*" + command: "make functional-test-coverage" + artifact_paths: + - ".coverage/*.out" + retry: + automatic: + limit: 1 + plugins: + - docker-compose#v3.8.0: + run: integration-test-cassandra + config: ./develop/buildkite/docker-compose-os2.yml + - label: ":golang: functional xdc test with cassandra" agents: queue: "default" diff --git a/develop/buildkite/scripts/coverage-report.sh b/develop/buildkite/scripts/coverage-report.sh index 4dc68f0cb23..be158ba83bb 100755 --- a/develop/buildkite/scripts/coverage-report.sh +++ b/develop/buildkite/scripts/coverage-report.sh @@ -10,6 +10,10 @@ buildkite-agent artifact download ".coverage/integration_coverprofile.out" . --s buildkite-agent artifact download ".coverage/functional_cassandra_coverprofile.out" . --step ":golang: functional test with cassandra (ES8)" --build "${BUILDKITE_BUILD_ID}" mv ./.coverage/functional_cassandra_coverprofile.out ./.coverage/functional_cassandra_es8_coverprofile.out +# OpenSearch 2. +buildkite-agent artifact download ".coverage/functional_cassandra_coverprofile.out" . --step ":golang: functional test with cassandra (OpenSearch 2)" --build "${BUILDKITE_BUILD_ID}" +mv ./.coverage/functional_cassandra_coverprofile.out ./.coverage/functional_cassandra_os2_coverprofile.out + # Cassandra. buildkite-agent artifact download ".coverage/functional_cassandra_coverprofile.out" . --step ":golang: functional test with cassandra" --build "${BUILDKITE_BUILD_ID}" buildkite-agent artifact download ".coverage/functional_xdc_cassandra_coverprofile.out" . --step ":golang: functional xdc test with cassandra" --build "${BUILDKITE_BUILD_ID}"