shard xdc also

temporalio · Oct 25, 2024 · a668f00 · a668f00
1 parent cbc1bd6
commit a668f00
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -370,12 +370,12 @@ jobs:
             persistence_driver: cassandra
             containers: [cassandra, elasticsearch]
             es_version: v7
-            parallel_flags: "-parallel=6"
+            parallel_flags: "-parallel=8"
           - name: sqlite
             persistence_type: sql
             persistence_driver: sqlite
             containers: []
-            parallel_flags: "-parallel=6"
+            parallel_flags: "-parallel=8"
           # The rest get smoke tests only:
           - name: cass_es8
             persistence_type: nosql
@@ -480,20 +480,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        shard_index: [0, 1]
         name: [cass_es, sqlite]
         include:
           - name: cass_es
             persistence_type: nosql
             persistence_driver: elasticsearch
             containers: [cassandra, elasticsearch]
-            parallel_flags: "-parallel=6"
           - name: sqlite
             persistence_type: sql
             persistence_driver: sqlite
             containers: []
-            parallel_flags: "-parallel=6"
     runs-on: ubuntu-20.04
     env:
+      TEST_TOTAL_SHARDS: 2
+      TEST_SHARD_INDEX: ${{ matrix.shard_index }}
       PERSISTENCE_TYPE: ${{ matrix.persistence_type }}
       PERSISTENCE_DRIVER: ${{ matrix.persistence_driver }}
       TEST_PARALLEL_FLAGS: ${{ matrix.parallel_flags }}
@@ -537,7 +538,7 @@ jobs:
         uses: actions/[email protected]
         if: ${{ !cancelled() }}
         with:
-          name: junit-xml--${{github.run_id}}--${{github.run_attempt}}--${{matrix.name}}--functional-test-xdc
+          name: junit-xml--${{github.run_id}}--${{github.run_attempt}}--${{matrix.name}}--${{matrix.shard_index}}--functional-test-xdc
           path: .testoutput
           include-hidden-files: true
           retention-days: 28

diff --git a/tests/xdc/base.go b/tests/xdc/base.go
@@ -87,6 +87,8 @@ func (s *xdcBaseSuite) clusterReplicationConfig() []*replicationpb.ClusterReplic
 }
 
 func (s *xdcBaseSuite) setupSuite(clusterNames []string, opts ...testcore.Option) {
+	testcore.CheckTestShard(s.T(), false)
+
 	s.testClusterFactory = testcore.NewTestClusterFactory()
 
 	params := testcore.ApplyTestClusterParams(opts)