From 19d432636903daa3987213882b440ae58cf8f619 Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Thu, 24 Oct 2024 20:00:36 -0700
Subject: [PATCH 01/16] limited test configurations

---
 .github/workflows/run-tests.yml        | 128 +++++++++++++------------
 tests/testcore/functional_test_base.go |  11 +++
 2 files changed, 76 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index b2384ae9266..3f3b187df40 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -60,7 +60,6 @@ env:
   PR_BASE_COMMIT: ${{ github.event.pull_request.base.sha }}
   DOCKER_COMPOSE_FILE: ./develop/github/docker-compose.yml
   TEMPORAL_VERSION_CHECK_DISABLED: 1
-  BUILDKITE_ANALYTICS_TOKEN: ${{ secrets.BUILDKITE_ANALYTICS_TOKEN }}
 
 jobs:
   set-up-single-test:
@@ -82,7 +81,7 @@ jobs:
     steps:
       - id: generate_output
         run: |
-          shards=3
+          shards=6
           timeout=20   # update this to TEST_TIMEOUT if you update the Makefile
           runs_on='["ubuntu-20.04"]'
           if [[ "${{ inputs.run_single_functional_test }}" == "true" || "${{ inputs.run_single_unit_test }}" == "true" ]]; then
@@ -231,7 +230,6 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-20.04
     env:
-      BUILDKITE_MESSAGE: '{"job": "unit-test"}'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -294,7 +292,6 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-20.04
     env:
-      BUILDKITE_MESSAGE: '{"job": "integration-test"}'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -366,50 +363,50 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: ${{ fromJson(needs.set-up-single-test.outputs.runs_on) }}
         shard_index: ${{ fromJson(needs.set-up-single-test.outputs.shard_indices) }}
-        name:
-          - cass_es
-          - cass_es8
-          - sqlite
-          - mysql8
-          - postgres12
-          - postgres12_pgx
+        smoke_tests_only: [false]
+        name: [cass_es, sqlite]
         include:
+          # These two get all tests:
           - name: cass_es
             persistence_type: nosql
             persistence_driver: cassandra
             containers: [cassandra, elasticsearch]
             es_version: v7
+          - name: sqlite
+            persistence_type: sql
+            persistence_driver: sqlite
+            containers: []
+          # The rest get smoke tests only:
           - name: cass_es8
             persistence_type: nosql
             persistence_driver: cassandra
             containers: [cassandra, elasticsearch8]
             es_version: v8
-          - name: sqlite
-            persistence_type: sql
-            persistence_driver: sqlite
-            containers: []
+            smoke_tests_only: true
           - name: mysql8
             persistence_type: sql
             persistence_driver: mysql8
             containers: [mysql]
+            smoke_tests_only: true
           - name: postgres12
             persistence_type: sql
             persistence_driver: postgres12
             containers: [postgresql]
+            smoke_tests_only: true
           - name: postgres12_pgx
             persistence_type: sql
             persistence_driver: postgres12_pgx
             containers: [postgresql]
-    runs-on: ${{ matrix.runs-on }}
+            smoke_tests_only: true
+    runs-on: ${{ fromJson(needs.set-up-single-test.outputs.runs_on) }}
     env:
       TEST_TOTAL_SHARDS: ${{ needs.set-up-single-test.outputs.total_shards }}
       TEST_SHARD_INDEX: ${{ matrix.shard_index }}
+      TEST_SMOKE_TESTS_ONLY: ${{ matrix.smoke_tests_only }}
       PERSISTENCE_TYPE: ${{ matrix.persistence_type }}
       PERSISTENCE_DRIVER: ${{ matrix.persistence_driver }}
       TEST_TIMEOUT: ${{ needs.set-up-single-test.outputs.test_timeout }}
-      BUILDKITE_MESSAGE: '{"job": "functional-test", "db": "${{ matrix.persistence_driver }}"}'
     steps:
       - uses: ScribeMD/docker-cache@0.3.7
         if: ${{ inputs.run_single_functional_test != true || (inputs.run_single_functional_test == true && contains(fromJSON(needs.set-up-single-test.outputs.dbs), env.PERSISTENCE_DRIVER)) }}
@@ -484,39 +481,44 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [cass_es, cass_es8, mysql8, postgres12, postgres12_pgx]
+        name: [cass_es, sqlite]
+        # TODO: remote this: name: [cass_es, cass_es8, mysql8, postgres12, postgres12_pgx]
         include:
           - name: cass_es
             persistence_type: nosql
             persistence_driver: elasticsearch
-            parallel_flags: ""
             containers: [cassandra, elasticsearch]
-          - name: cass_es8
-            persistence_type: nosql
-            persistence_driver: elasticsearch
-            parallel_flags: ""
-            containers: [cassandra, elasticsearch8]
-          - name: mysql8
-            persistence_type: sql
-            persistence_driver: mysql8
-            parallel_flags: ""
-            containers: [mysql]
-          - name: postgres12
-            persistence_type: sql
-            persistence_driver: postgres12
-            parallel_flags: "-parallel=2" # reduce parallelism for postgres
-            containers: [postgresql]
-          - name: postgres12_pgx
+            # parallel_flags: ""
+          - name: sqlite
             persistence_type: sql
-            persistence_driver: postgres12_pgx
-            parallel_flags: "-parallel=2" # reduce parallelism for postgres
-            containers: [postgresql]
+            persistence_driver: sqlite
+            containers: []
+            # parallel_flags: ""
+          # - name: cass_es8
+          #   persistence_type: nosql
+          #   persistence_driver: elasticsearch
+          #   parallel_flags: ""
+          #   containers: [cassandra, elasticsearch8]
+          # - name: mysql8
+          #   persistence_type: sql
+          #   persistence_driver: mysql8
+          #   parallel_flags: ""
+          #   containers: [mysql]
+          # - name: postgres12
+          #   persistence_type: sql
+          #   persistence_driver: postgres12
+          #   parallel_flags: "-parallel=2" # reduce parallelism for postgres
+          #   containers: [postgresql]
+          # - name: postgres12_pgx
+          #   persistence_type: sql
+          #   persistence_driver: postgres12_pgx
+          #   parallel_flags: "-parallel=2" # reduce parallelism for postgres
+          #   containers: [postgresql]
     runs-on: ubuntu-20.04
     env:
       PERSISTENCE_TYPE: ${{ matrix.persistence_type }}
       PERSISTENCE_DRIVER: ${{ matrix.persistence_driver }}
-      BUILDKITE_MESSAGE: '{"job": "functional-test-xdc", "db": "${{ matrix.persistence_driver }}"}'
-      TEST_PARALLEL_FLAGS: ${{ matrix.parallel_flags }}
+      # TEST_PARALLEL_FLAGS: ${{ matrix.parallel_flags }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -581,35 +583,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name:
-          - cass_es
-          - cass_es8
-          - mysql8
-          - postgres12
-          - postgres12_pgx
+        name: [cass_es, sqlite]
+        # TODO: remove this: name: [cass_es, cass_es8, mysql8, postgres12, postgres12_pgx]
         include:
           - name: cass_es
             persistence_type: nosql
             persistence_driver: elasticsearch
             containers: [cassandra, elasticsearch]
             es_version: v7
-          - name: cass_es8
-            persistence_type: nosql
-            persistence_driver: elasticsearch
-            containers: [cassandra, elasticsearch8]
-            es_version: v8
-          - name: mysql8
-            persistence_type: sql
-            persistence_driver: mysql8
-            containers: [mysql]
-          - name: postgres12
-            persistence_type: sql
-            persistence_driver: postgres12
-            containers: [postgresql]
-          - name: postgres12_pgx
+          - name: sqlite
             persistence_type: sql
-            persistence_driver: postgres12_pgx
-            containers: [postgresql]
+            persistence_driver: sqlite
+            containers: []
+          # - name: cass_es8
+          #   persistence_type: nosql
+          #   persistence_driver: elasticsearch
+          #   containers: [cassandra, elasticsearch8]
+          #   es_version: v8
+          # - name: mysql8
+          #   persistence_type: sql
+          #   persistence_driver: mysql8
+          #   containers: [mysql]
+          # - name: postgres12
+          #   persistence_type: sql
+          #   persistence_driver: postgres12
+          #   containers: [postgresql]
+          # - name: postgres12_pgx
+          #   persistence_type: sql
+          #   persistence_driver: postgres12_pgx
+          #   containers: [postgresql]
     runs-on: ubuntu-20.04
     env:
       PERSISTENCE_TYPE: ${{ matrix.persistence_type }}
diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
index 6d57aa59847..54b8b3513a9 100644
--- a/tests/testcore/functional_test_base.go
+++ b/tests/testcore/functional_test_base.go
@@ -32,6 +32,7 @@ import (
 	"maps"
 	"os"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/dgryski/go-farm"
@@ -208,6 +209,16 @@ func (s *FunctionalTestBase) SetupTest() {
 
 // checkTestShard supports test sharding based on environment variables.
 func (s *FunctionalTestBase) checkTestShard() {
+	smokeOnly := os.Getenv("TEST_SMOKE_TESTS_ONLY")
+	if smokeOnly == "true" {
+		suiteName, _, _ := strings.Cut(s.T().Name(), "/")
+		switch suiteName {
+		case "AdvancedVisibilitySuite", "ClientMiscTestSuite":
+			return
+		}
+		s.T().Skip("Skipping %s, not included in smoke tests", s.T().Name())
+	}
+
 	totalStr := os.Getenv("TEST_TOTAL_SHARDS")
 	indexStr := os.Getenv("TEST_SHARD_INDEX")
 	if totalStr == "" || indexStr == "" {

From 0985f64fb5cd7cf8d8db9a15bb20ca1212aeccea Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Thu, 24 Oct 2024 20:04:32 -0700
Subject: [PATCH 02/16] gha lint

---
 .github/workflows/run-tests.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 3f3b187df40..9fcee01c13a 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -229,7 +229,6 @@ jobs:
     strategy:
       fail-fast: false
     runs-on: ubuntu-20.04
-    env:
     steps:
       - uses: actions/checkout@v4
         with:
@@ -291,7 +290,6 @@ jobs:
     strategy:
       fail-fast: false
     runs-on: ubuntu-20.04
-    env:
     steps:
       - uses: actions/checkout@v4
         with:
@@ -457,7 +455,7 @@ jobs:
         uses: actions/upload-artifact@v4.4.3
         if: ${{ !cancelled() && !inputs.run_single_functional_test }}
         with:
-          name: junit-xml--${{github.run_id}}--${{github.run_attempt}}--${{matrix.runs-on}}--${{matrix.name}}--${{matrix.shard_index}}--functional-test
+          name: junit-xml--${{github.run_id}}--${{github.run_attempt}}--${{matrix.name}}--${{matrix.shard_index}}--${{matrix.smoke_tests_only}}--functional-test
           path: .testoutput
           include-hidden-files: true
           retention-days: 28

From ae5c4c9e494ad18e0adcfec2942fd802a42ffc3e Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Thu, 24 Oct 2024 22:55:13 -0700
Subject: [PATCH 03/16] move sharding back to suite level

---
 tests/namespace_delete_test.go         |  3 ++
 tests/testcore/functional_test_base.go | 45 +++++++++++++++-----------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/tests/namespace_delete_test.go b/tests/namespace_delete_test.go
index a0952623d13..46211ab5229 100644
--- a/tests/namespace_delete_test.go
+++ b/tests/namespace_delete_test.go
@@ -79,6 +79,9 @@ func TestNamespaceSuite(t *testing.T) {
 }
 
 func (s *namespaceTestSuite) SetupSuite() {
+	// This suite doesn't embed FunctionalTestBase so we have to call CheckTestShard manually.
+	testcore.CheckTestShard(s.T())
+
 	s.logger = log.NewTestLogger()
 	s.testClusterFactory = testcore.NewTestClusterFactory()
 
diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
index 54b8b3513a9..a8cd23f27e4 100644
--- a/tests/testcore/functional_test_base.go
+++ b/tests/testcore/functional_test_base.go
@@ -31,8 +31,10 @@ import (
 	"fmt"
 	"maps"
 	"os"
+	"slices"
 	"strconv"
 	"strings"
+	"testing"
 	"time"
 
 	"github.com/dgryski/go-farm"
@@ -87,6 +89,13 @@ type (
 	Option func(params *TestClusterParams)
 )
 
+var (
+	smokeTestSuites = []string{
+		"TestAdvancedVisibilitySuite",
+		"TestClientMiscTestSuite",
+	}
+)
+
 // WithFxOptionsForService returns an Option which, when passed as an argument to setupSuite, will append the given list
 // of fx options to the end of the arguments to the fx.New call for the given service. For example, if you want to
 // obtain the shard controller for the history service, you can do this:
@@ -148,7 +157,15 @@ func (s *FunctionalTestBase) SetDynamicConfigOverrides(dynamicConfig map[dynamic
 	s.dynamicConfigOverrides = dynamicConfig
 }
 
+// All test suites that inherit FunctionalTestBase and overwrite SetupSuite must
+// call this testcore FunctionalTestBase.SetupSuite function to distribute the suites
+// into partitions. Otherwise, the test suite will be executed multiple times
+// in each partition.
+// Furthermore, all test suites in the "tests/" directory that don't inherit
+// from FunctionalTestBase must implement SetupSuite that calls checkTestShard.
 func (s *FunctionalTestBase) SetupSuite(defaultClusterConfigFile string, options ...Option) {
+	CheckTestShard(s.T())
+
 	s.testClusterFactory = NewTestClusterFactory()
 
 	params := ApplyTestClusterParams(options)
@@ -197,26 +214,18 @@ func (s *FunctionalTestBase) SetupSuite(defaultClusterConfigFile string, options
 	}
 }
 
-// All test suites that inherit FunctionalTestBase and overwrite SetupTest must
-// call this testcore FunctionalTestBase.SetupTest function to distribute the tests
-// into partitions. Otherwise, the test suite will be executed multiple times
-// in each partition.
-// Furthermore, all test suites in the "tests/" directory that don't inherit
-// from FunctionalTestBase must implement SetupTest that calls checkTestShard.
 func (s *FunctionalTestBase) SetupTest() {
-	s.checkTestShard()
 }
 
-// checkTestShard supports test sharding based on environment variables.
-func (s *FunctionalTestBase) checkTestShard() {
+// CheckTestShard supports test sharding based on environment variables.
+func CheckTestShard(t *testing.T) {
 	smokeOnly := os.Getenv("TEST_SMOKE_TESTS_ONLY")
 	if smokeOnly == "true" {
-		suiteName, _, _ := strings.Cut(s.T().Name(), "/")
-		switch suiteName {
-		case "AdvancedVisibilitySuite", "ClientMiscTestSuite":
+		suiteName, _, _ := strings.Cut(t.Name(), "/")
+		if slices.Contains(smokeTestSuites, suiteName) {
 			return
 		}
-		s.T().Skip("Skipping %s, not included in smoke tests", s.T().Name())
+		t.Skipf("Skipping %s, not included in smoke tests", t.Name())
 	}
 
 	totalStr := os.Getenv("TEST_TOTAL_SHARDS")
@@ -226,11 +235,11 @@ func (s *FunctionalTestBase) checkTestShard() {
 	}
 	total, err := strconv.Atoi(totalStr)
 	if err != nil || total < 1 {
-		s.T().Fatal("Couldn't convert TEST_TOTAL_SHARDS")
+		t.Fatal("Couldn't convert TEST_TOTAL_SHARDS")
 	}
 	index, err := strconv.Atoi(indexStr)
 	if err != nil || index < 0 || index >= total {
-		s.T().Fatal("Couldn't convert TEST_SHARD_INDEX")
+		t.Fatal("Couldn't convert TEST_SHARD_INDEX")
 	}
 
 	// This was determined empirically to distribute our existing test names
@@ -238,12 +247,12 @@ func (s *FunctionalTestBase) checkTestShard() {
 	// For parallelism 4, use 11. For 3, use 26. For 2, use 20.
 	const salt = "-salt-26"
 
-	nameToHash := s.T().Name() + salt
+	nameToHash := t.Name() + salt
 	testIndex := int(farm.Fingerprint32([]byte(nameToHash))) % total
 	if testIndex != index {
-		s.T().Skipf("Skipping %s in test shard %d/%d (it runs in %d)", s.T().Name(), index+1, total, testIndex+1)
+		t.Skipf("Skipping %s in test shard %d/%d (it runs in %d)", t.Name(), index+1, total, testIndex+1)
 	}
-	s.T().Logf("Running %s in test shard %d/%d", s.T().Name(), index+1, total)
+	t.Logf("Running %s in test shard %d/%d", t.Name(), index+1, total)
 }
 
 func (s *FunctionalTestBase) registerNamespaceWithDefaults(name string) error {

From 4a921b9c96525f0b81ee9baddc389cb50f00da41 Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Thu, 24 Oct 2024 22:55:26 -0700
Subject: [PATCH 04/16] cleanup

---
 tests/links_test.go               | 1 +
 tests/update_workflow_sdk_test.go | 3 +--
 tests/update_workflow_test.go     | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/links_test.go b/tests/links_test.go
index 184dee22389..05ca49d757c 100644
--- a/tests/links_test.go
+++ b/tests/links_test.go
@@ -43,6 +43,7 @@ type LinksSuite struct {
 }
 
 func TestLinksTestSuite(t *testing.T) {
+	t.Parallel()
 	suite.Run(t, new(LinksSuite))
 }
 
diff --git a/tests/update_workflow_sdk_test.go b/tests/update_workflow_sdk_test.go
index 470af01eac0..320fa2fe3a4 100644
--- a/tests/update_workflow_sdk_test.go
+++ b/tests/update_workflow_sdk_test.go
@@ -52,8 +52,7 @@ type UpdateWorkflowSdkSuite struct {
 
 func TestUpdateWorkflowSdkSuite(t *testing.T) {
 	t.Parallel()
-	s := new(UpdateWorkflowSdkSuite)
-	suite.Run(t, s)
+	suite.Run(t, new(UpdateWorkflowSdkSuite))
 }
 
 func (s *UpdateWorkflowSdkSuite) TestUpdateWorkflow_TerminateWorkflowAfterUpdateAdmitted() {
diff --git a/tests/update_workflow_test.go b/tests/update_workflow_test.go
index fd0c646f811..b02b1adce47 100644
--- a/tests/update_workflow_test.go
+++ b/tests/update_workflow_test.go
@@ -61,8 +61,7 @@ type UpdateWorkflowSuite struct {
 
 func TestUpdateWorkflowSuite(t *testing.T) {
 	t.Parallel()
-	s := new(UpdateWorkflowSuite)
-	suite.Run(t, s)
+	suite.Run(t, new(UpdateWorkflowSuite))
 }
 
 // TODO: extract sendUpdate* methods to separate package.

From 9a33740d611185e211a894083505151b820b039f Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Thu, 24 Oct 2024 23:05:54 -0700
Subject: [PATCH 05/16] use zero-based indexes for clarity

---
 tests/testcore/functional_test_base.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
index a8cd23f27e4..e0aa7ad6385 100644
--- a/tests/testcore/functional_test_base.go
+++ b/tests/testcore/functional_test_base.go
@@ -250,9 +250,9 @@ func CheckTestShard(t *testing.T) {
 	nameToHash := t.Name() + salt
 	testIndex := int(farm.Fingerprint32([]byte(nameToHash))) % total
 	if testIndex != index {
-		t.Skipf("Skipping %s in test shard %d/%d (it runs in %d)", t.Name(), index+1, total, testIndex+1)
+		t.Skipf("Skipping %s in test shard %d/%d (it runs in %d)", t.Name(), index, total, testIndex)
 	}
-	t.Logf("Running %s in test shard %d/%d", t.Name(), index+1, total)
+	t.Logf("Running %s in test shard %d/%d", t.Name(), index, total)
 }
 
 func (s *FunctionalTestBase) registerNamespaceWithDefaults(name string) error {

From d6becd9cd8356a18857a110b7d98d77f070761d5 Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Thu, 24 Oct 2024 23:53:15 -0700
Subject: [PATCH 06/16] actually really remove the client interfaces

---
 tests/testcore/client.go               | 46 --------------------------
 tests/testcore/functional_test_base.go |  4 +--
 tests/testcore/test_cluster.go         |  5 +--
 3 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 tests/testcore/client.go

diff --git a/tests/testcore/client.go b/tests/testcore/client.go
deleted file mode 100644
index aa670d81a80..00000000000
--- a/tests/testcore/client.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// The MIT License
-//
-// Copyright (c) 2020 Temporal Technologies Inc.  All rights reserved.
-//
-// Copyright (c) 2020 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package testcore
-
-import (
-	"go.temporal.io/api/workflowservice/v1"
-	"go.temporal.io/server/api/adminservice/v1"
-	"go.temporal.io/server/api/historyservice/v1"
-)
-
-// AdminClient is the interface exposed by admin service client
-type AdminClient interface {
-	adminservice.AdminServiceClient
-}
-
-// FrontendClient is the interface exposed by frontend service client
-type FrontendClient interface {
-	workflowservice.WorkflowServiceClient
-}
-
-// HistoryClient is the interface exposed by history service client
-type HistoryClient interface {
-	historyservice.HistoryServiceClient
-}
diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
index e0aa7ad6385..b7d662b9fb2 100644
--- a/tests/testcore/functional_test_base.go
+++ b/tests/testcore/functional_test_base.go
@@ -121,11 +121,11 @@ func (s *FunctionalTestBase) GetTestClusterConfig() *TestClusterConfig {
 	return s.testClusterConfig
 }
 
-func (s *FunctionalTestBase) FrontendClient() FrontendClient {
+func (s *FunctionalTestBase) FrontendClient() workflowservice.WorkflowServiceClient {
 	return s.client
 }
 
-func (s *FunctionalTestBase) AdminClient() AdminClient {
+func (s *FunctionalTestBase) AdminClient() adminservice.AdminServiceClient {
 	return s.adminClient
 }
 
diff --git a/tests/testcore/test_cluster.go b/tests/testcore/test_cluster.go
index 01f7f24b4b0..94a799c91cb 100644
--- a/tests/testcore/test_cluster.go
+++ b/tests/testcore/test_cluster.go
@@ -37,6 +37,7 @@ import (
 
 	"github.com/pborman/uuid"
 	"go.temporal.io/api/operatorservice/v1"
+	"go.temporal.io/api/workflowservice/v1"
 	"go.temporal.io/server/api/adminservice/v1"
 	"go.temporal.io/server/api/historyservice/v1"
 	"go.temporal.io/server/api/matchingservice/v1"
@@ -540,12 +541,12 @@ func (tc *TestCluster) ArchivalBase() *ArchiverBase {
 }
 
 // FrontendClient returns a frontend client from the test cluster
-func (tc *TestCluster) FrontendClient() FrontendClient {
+func (tc *TestCluster) FrontendClient() workflowservice.WorkflowServiceClient {
 	return tc.host.FrontendClient()
 }
 
 // AdminClient returns an admin client from the test cluster
-func (tc *TestCluster) AdminClient() AdminClient {
+func (tc *TestCluster) AdminClient() adminservice.AdminServiceClient {
 	return tc.host.AdminClient()
 }
 

From aae3df4fc7ed607ae3d3110a2bc5716c285794a9 Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Fri, 25 Oct 2024 00:00:41 -0700
Subject: [PATCH 07/16] simplify shard index thing

---
 .github/workflows/run-tests.yml        | 12 +++++-------
 tests/testcore/functional_test_base.go |  8 +++++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 9fcee01c13a..2b636ac8325 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -362,7 +362,6 @@ jobs:
       fail-fast: false
       matrix:
         shard_index: ${{ fromJson(needs.set-up-single-test.outputs.shard_indices) }}
-        smoke_tests_only: [false]
         name: [cass_es, sqlite]
         include:
           # These two get all tests:
@@ -381,27 +380,26 @@ jobs:
             persistence_driver: cassandra
             containers: [cassandra, elasticsearch8]
             es_version: v8
-            smoke_tests_only: true
+            shard_index: smoke_only
           - name: mysql8
             persistence_type: sql
             persistence_driver: mysql8
             containers: [mysql]
-            smoke_tests_only: true
+            shard_index: smoke_only
           - name: postgres12
             persistence_type: sql
             persistence_driver: postgres12
             containers: [postgresql]
-            smoke_tests_only: true
+            shard_index: smoke_only
           - name: postgres12_pgx
             persistence_type: sql
             persistence_driver: postgres12_pgx
             containers: [postgresql]
-            smoke_tests_only: true
+            shard_index: smoke_only
     runs-on: ${{ fromJson(needs.set-up-single-test.outputs.runs_on) }}
     env:
       TEST_TOTAL_SHARDS: ${{ needs.set-up-single-test.outputs.total_shards }}
       TEST_SHARD_INDEX: ${{ matrix.shard_index }}
-      TEST_SMOKE_TESTS_ONLY: ${{ matrix.smoke_tests_only }}
       PERSISTENCE_TYPE: ${{ matrix.persistence_type }}
       PERSISTENCE_DRIVER: ${{ matrix.persistence_driver }}
       TEST_TIMEOUT: ${{ needs.set-up-single-test.outputs.test_timeout }}
@@ -455,7 +453,7 @@ jobs:
         uses: actions/upload-artifact@v4.4.3
         if: ${{ !cancelled() && !inputs.run_single_functional_test }}
         with:
-          name: junit-xml--${{github.run_id}}--${{github.run_attempt}}--${{matrix.name}}--${{matrix.shard_index}}--${{matrix.smoke_tests_only}}--functional-test
+          name: junit-xml--${{github.run_id}}--${{github.run_attempt}}--${{matrix.name}}--${{matrix.shard_index}}--functional-test
           path: .testoutput
           include-hidden-files: true
           retention-days: 28
diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
index b7d662b9fb2..9ca4a6cfcb6 100644
--- a/tests/testcore/functional_test_base.go
+++ b/tests/testcore/functional_test_base.go
@@ -219,20 +219,22 @@ func (s *FunctionalTestBase) SetupTest() {
 
 // CheckTestShard supports test sharding based on environment variables.
 func CheckTestShard(t *testing.T) {
-	smokeOnly := os.Getenv("TEST_SMOKE_TESTS_ONLY")
-	if smokeOnly == "true" {
+	indexStr := os.Getenv("TEST_SHARD_INDEX")
+	// special value to run only a few suites on the extended set of persistence drivers
+	if indexStr == "smoke_only" {
 		suiteName, _, _ := strings.Cut(t.Name(), "/")
 		if slices.Contains(smokeTestSuites, suiteName) {
+			t.Logf("Running %s in smoke tests", t.Name())
 			return
 		}
 		t.Skipf("Skipping %s, not included in smoke tests", t.Name())
 	}
 
 	totalStr := os.Getenv("TEST_TOTAL_SHARDS")
-	indexStr := os.Getenv("TEST_SHARD_INDEX")
 	if totalStr == "" || indexStr == "" {
 		return
 	}
+
 	total, err := strconv.Atoi(totalStr)
 	if err != nil || total < 1 {
 		t.Fatal("Couldn't convert TEST_TOTAL_SHARDS")

From 6c139f72d9f52a464c44859e7e2e47255ed10f0b Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Fri, 25 Oct 2024 00:33:23 -0700
Subject: [PATCH 08/16] log elapsed time

---
 tests/testcore/functional_test_base.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
index 9ca4a6cfcb6..c8fc61c405c 100644
--- a/tests/testcore/functional_test_base.go
+++ b/tests/testcore/functional_test_base.go
@@ -255,6 +255,12 @@ func CheckTestShard(t *testing.T) {
 		t.Skipf("Skipping %s in test shard %d/%d (it runs in %d)", t.Name(), index, total, testIndex)
 	}
 	t.Logf("Running %s in test shard %d/%d", t.Name(), index, total)
+
+	start := time.Now()
+	t.Cleanup(func() {
+		// log directly to stdout so it always shows up in output
+		fmt.Printf("### elapsed {%q, %f}\n", t.Name(), time.Since(start).Seconds())
+	})
 }
 
 func (s *FunctionalTestBase) registerNamespaceWithDefaults(name string) error {

From 849d87b14cfbfe5636cc0eeb01679c97f3fedd41 Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Fri, 25 Oct 2024 00:37:56 -0700
Subject: [PATCH 09/16] try 8 shards

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 2b636ac8325..22c9ec73327 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -81,7 +81,7 @@ jobs:
     steps:
       - id: generate_output
         run: |
-          shards=6
+          shards=8
           timeout=20   # update this to TEST_TIMEOUT if you update the Makefile
           runs_on='["ubuntu-20.04"]'
           if [[ "${{ inputs.run_single_functional_test }}" == "true" || "${{ inputs.run_single_unit_test }}" == "true" ]]; then

From 538b41d5c714c5e53da557ce0e9d94b6d914536d Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Fri, 25 Oct 2024 10:53:49 -0700
Subject: [PATCH 10/16] push parallel to 6

---
 .github/workflows/run-tests.yml | 48 +++++----------------------------
 1 file changed, 6 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 22c9ec73327..51a9c59af1a 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -370,10 +370,12 @@ jobs:
             persistence_driver: cassandra
             containers: [cassandra, elasticsearch]
             es_version: v7
+            parallel_flags: "-parallel=6"
           - name: sqlite
             persistence_type: sql
             persistence_driver: sqlite
             containers: []
+            parallel_flags: "-parallel=6"
           # The rest get smoke tests only:
           - name: cass_es8
             persistence_type: nosql
@@ -403,6 +405,7 @@ jobs:
       PERSISTENCE_TYPE: ${{ matrix.persistence_type }}
       PERSISTENCE_DRIVER: ${{ matrix.persistence_driver }}
       TEST_TIMEOUT: ${{ needs.set-up-single-test.outputs.test_timeout }}
+      TEST_PARALLEL_FLAGS: ${{ matrix.parallel_flags }}
     steps:
       - uses: ScribeMD/docker-cache@0.3.7
         if: ${{ inputs.run_single_functional_test != true || (inputs.run_single_functional_test == true && contains(fromJSON(needs.set-up-single-test.outputs.dbs), env.PERSISTENCE_DRIVER)) }}
@@ -478,43 +481,22 @@ jobs:
       fail-fast: false
       matrix:
         name: [cass_es, sqlite]
-        # TODO: remote this: name: [cass_es, cass_es8, mysql8, postgres12, postgres12_pgx]
         include:
           - name: cass_es
             persistence_type: nosql
             persistence_driver: elasticsearch
             containers: [cassandra, elasticsearch]
-            # parallel_flags: ""
+            parallel_flags: "-parallel=6"
           - name: sqlite
             persistence_type: sql
             persistence_driver: sqlite
             containers: []
-            # parallel_flags: ""
-          # - name: cass_es8
-          #   persistence_type: nosql
-          #   persistence_driver: elasticsearch
-          #   parallel_flags: ""
-          #   containers: [cassandra, elasticsearch8]
-          # - name: mysql8
-          #   persistence_type: sql
-          #   persistence_driver: mysql8
-          #   parallel_flags: ""
-          #   containers: [mysql]
-          # - name: postgres12
-          #   persistence_type: sql
-          #   persistence_driver: postgres12
-          #   parallel_flags: "-parallel=2" # reduce parallelism for postgres
-          #   containers: [postgresql]
-          # - name: postgres12_pgx
-          #   persistence_type: sql
-          #   persistence_driver: postgres12_pgx
-          #   parallel_flags: "-parallel=2" # reduce parallelism for postgres
-          #   containers: [postgresql]
+            parallel_flags: "-parallel=6"
     runs-on: ubuntu-20.04
     env:
       PERSISTENCE_TYPE: ${{ matrix.persistence_type }}
       PERSISTENCE_DRIVER: ${{ matrix.persistence_driver }}
-      # TEST_PARALLEL_FLAGS: ${{ matrix.parallel_flags }}
+      TEST_PARALLEL_FLAGS: ${{ matrix.parallel_flags }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -580,7 +562,6 @@ jobs:
       fail-fast: false
       matrix:
         name: [cass_es, sqlite]
-        # TODO: remove this: name: [cass_es, cass_es8, mysql8, postgres12, postgres12_pgx]
         include:
           - name: cass_es
             persistence_type: nosql
@@ -591,23 +572,6 @@ jobs:
             persistence_type: sql
             persistence_driver: sqlite
             containers: []
-          # - name: cass_es8
-          #   persistence_type: nosql
-          #   persistence_driver: elasticsearch
-          #   containers: [cassandra, elasticsearch8]
-          #   es_version: v8
-          # - name: mysql8
-          #   persistence_type: sql
-          #   persistence_driver: mysql8
-          #   containers: [mysql]
-          # - name: postgres12
-          #   persistence_type: sql
-          #   persistence_driver: postgres12
-          #   containers: [postgresql]
-          # - name: postgres12_pgx
-          #   persistence_type: sql
-          #   persistence_driver: postgres12_pgx
-          #   containers: [postgresql]
     runs-on: ubuntu-20.04
     env:
       PERSISTENCE_TYPE: ${{ matrix.persistence_type }}

From 2379d76a7d1ba935ab8571002450f1060a3b65fb Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Fri, 25 Oct 2024 11:27:29 -0700
Subject: [PATCH 11/16] shard versioning at test level

---
 tests/namespace_delete_test.go         |  2 +-
 tests/testcore/functional_test_base.go | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/tests/namespace_delete_test.go b/tests/namespace_delete_test.go
index 46211ab5229..04ecf459ed9 100644
--- a/tests/namespace_delete_test.go
+++ b/tests/namespace_delete_test.go
@@ -80,7 +80,7 @@ func TestNamespaceSuite(t *testing.T) {
 
 func (s *namespaceTestSuite) SetupSuite() {
 	// This suite doesn't embed FunctionalTestBase so we have to call CheckTestShard manually.
-	testcore.CheckTestShard(s.T())
+	testcore.CheckTestShard(s.T(), false)
 
 	s.logger = log.NewTestLogger()
 	s.testClusterFactory = testcore.NewTestClusterFactory()
diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
index c8fc61c405c..3542536525f 100644
--- a/tests/testcore/functional_test_base.go
+++ b/tests/testcore/functional_test_base.go
@@ -31,7 +31,6 @@ import (
 	"fmt"
 	"maps"
 	"os"
-	"slices"
 	"strconv"
 	"strings"
 	"testing"
@@ -90,9 +89,12 @@ type (
 )
 
 var (
-	smokeTestSuites = []string{
-		"TestAdvancedVisibilitySuite",
-		"TestClientMiscTestSuite",
+	smokeTestSuites = map[string]bool{
+		"TestAdvancedVisibilitySuite": true,
+		"TestClientMiscTestSuite":     true,
+	}
+	shardByTestSuites = map[string]bool{
+		"TestVersioningFunctionalSuite": true,
 	}
 )
 
@@ -164,7 +166,7 @@ func (s *FunctionalTestBase) SetDynamicConfigOverrides(dynamicConfig map[dynamic
 // Furthermore, all test suites in the "tests/" directory that don't inherit
 // from FunctionalTestBase must implement SetupSuite that calls checkTestShard.
 func (s *FunctionalTestBase) SetupSuite(defaultClusterConfigFile string, options ...Option) {
-	CheckTestShard(s.T())
+	CheckTestShard(s.T(), false)
 
 	s.testClusterFactory = NewTestClusterFactory()
 
@@ -215,15 +217,22 @@ func (s *FunctionalTestBase) SetupSuite(defaultClusterConfigFile string, options
 }
 
 func (s *FunctionalTestBase) SetupTest() {
+	CheckTestShard(s.T(), true)
 }
 
 // CheckTestShard supports test sharding based on environment variables.
-func CheckTestShard(t *testing.T) {
+func CheckTestShard(t *testing.T, atTestLevel bool) {
+	suiteName, _, _ := strings.Cut(t.Name(), "/")
+
+	shouldShardAtTestLevel := shardByTestSuites[suiteName]
+	if shouldShardAtTestLevel != atTestLevel {
+		return
+	}
+
 	indexStr := os.Getenv("TEST_SHARD_INDEX")
 	// special value to run only a few suites on the extended set of persistence drivers
 	if indexStr == "smoke_only" {
-		suiteName, _, _ := strings.Cut(t.Name(), "/")
-		if slices.Contains(smokeTestSuites, suiteName) {
+		if smokeTestSuites[suiteName] {
 			t.Logf("Running %s in smoke tests", t.Name())
 			return
 		}

From 21c33d42741e6868d503a44b493dea156ee6d34a Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Fri, 25 Oct 2024 11:37:38 -0700
Subject: [PATCH 12/16] comments

---
 tests/testcore/functional_test_base.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
index 3542536525f..8ad4e7e7ade 100644
--- a/tests/testcore/functional_test_base.go
+++ b/tests/testcore/functional_test_base.go
@@ -164,7 +164,11 @@ func (s *FunctionalTestBase) SetDynamicConfigOverrides(dynamicConfig map[dynamic
 // into partitions. Otherwise, the test suite will be executed multiple times
 // in each partition.
 // Furthermore, all test suites in the "tests/" directory that don't inherit
-// from FunctionalTestBase must implement SetupSuite that calls checkTestShard.
+// from FunctionalTestBase must implement SetupSuite that calls CheckTestShard.
+//
+// Note that most suites are sharded at the suite level to avoid startup overhead,
+// but some large suites may be sharded at the test level, i.e. this call will be a
+// no-op and the determination will be done in SetupTest.
 func (s *FunctionalTestBase) SetupSuite(defaultClusterConfigFile string, options ...Option) {
 	CheckTestShard(s.T(), false)
 
@@ -216,6 +220,13 @@ func (s *FunctionalTestBase) SetupSuite(defaultClusterConfigFile string, options
 	}
 }
 
+// All test suites that inherit FunctionalTestBase and overwrite SetupTest must
+// call this testcore FunctionalTestBase.SetupTest function to distribute the tests
+// into partitions. Otherwise, the test suite will be executed multiple times
+// in each partition.
+//
+// Note that most suites are sharded at the suite level to avoid startup overhead
+// (i.e. this is a no-op), but some large suites may be sharded at the test level.
 func (s *FunctionalTestBase) SetupTest() {
 	CheckTestShard(s.T(), true)
 }

From b2601dc0934d9a61b4925497d99cc3a406263196 Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Fri, 25 Oct 2024 12:00:52 -0700
Subject: [PATCH 13/16] disable this one temporarily

---
 tests/max_buffered_event_test.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/max_buffered_event_test.go b/tests/max_buffered_event_test.go
index 642195abe3a..61072339080 100644
--- a/tests/max_buffered_event_test.go
+++ b/tests/max_buffered_event_test.go
@@ -51,6 +51,7 @@ func TestMaxBufferedEventSuite(t *testing.T) {
 }
 
 func (s *MaxBufferedEventSuite) TestMaxBufferedEventsLimit() {
+	s.T().Skip("this test seems to get stuck, disabling temporarily")
 	/*
 		This test starts a workflow, and block its workflow task, then sending
 		signals to it which will be buffered. The default max buffered event

From cbc1bd65bbfdfc562ccebf7174415c220453e074 Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Fri, 25 Oct 2024 12:27:42 -0700
Subject: [PATCH 14/16] get from junit logs instead

---
 tests/testcore/functional_test_base.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
index 8ad4e7e7ade..b4c9b41fd88 100644
--- a/tests/testcore/functional_test_base.go
+++ b/tests/testcore/functional_test_base.go
@@ -275,12 +275,6 @@ func CheckTestShard(t *testing.T, atTestLevel bool) {
 		t.Skipf("Skipping %s in test shard %d/%d (it runs in %d)", t.Name(), index, total, testIndex)
 	}
 	t.Logf("Running %s in test shard %d/%d", t.Name(), index, total)
-
-	start := time.Now()
-	t.Cleanup(func() {
-		// log directly to stdout so it always shows up in output
-		fmt.Printf("### elapsed {%q, %f}\n", t.Name(), time.Since(start).Seconds())
-	})
 }
 
 func (s *FunctionalTestBase) registerNamespaceWithDefaults(name string) error {

From a668f00a3953aca357ddf3df0c45802db5b27253 Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Fri, 25 Oct 2024 14:00:24 -0700
Subject: [PATCH 15/16] shard xdc also

---
 .github/workflows/run-tests.yml | 11 ++++++-----
 tests/xdc/base.go               |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 51a9c59af1a..8332ee7370a 100644
--- 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/upload-artifact@v4.4.3
         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
index 0a6ed29e28a..1f37523c3d3 100644
--- 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)

From 904aa4c585a99d649bff8895fc749b5d0bce462e Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Fri, 25 Oct 2024 15:52:13 -0700
Subject: [PATCH 16/16] update salt again

---
 tests/testcore/functional_test_base.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/testcore/functional_test_base.go b/tests/testcore/functional_test_base.go
index b4c9b41fd88..f096abd19b8 100644
--- a/tests/testcore/functional_test_base.go
+++ b/tests/testcore/functional_test_base.go
@@ -266,8 +266,7 @@ func CheckTestShard(t *testing.T, atTestLevel bool) {
 
 	// This was determined empirically to distribute our existing test names
 	// reasonably well. This can be adjusted from time to time.
-	// For parallelism 4, use 11. For 3, use 26. For 2, use 20.
-	const salt = "-salt-26"
+	const salt = "-salt-107"
 
 	nameToHash := t.Name() + salt
 	testIndex := int(farm.Fingerprint32([]byte(nameToHash))) % total