diff --git a/tools/integration_tests/improved_run_e2e_tests.sh b/tools/integration_tests/improved_run_e2e_tests.sh index bfd0d2b65a..d048c3beee 100755 --- a/tools/integration_tests/improved_run_e2e_tests.sh +++ b/tools/integration_tests/improved_run_e2e_tests.sh @@ -359,6 +359,7 @@ TEST_PACKAGES_COMMON=( "buffered_read" "flag_optimizations" "symlink_handling" + "shared_chunk_cache" ) # filter_array: Filters an array in place keeping only elements matching the regex. diff --git a/tools/integration_tests/shared_chunk_cache/setup_test.go b/tools/integration_tests/shared_chunk_cache/setup_test.go index 35a0bbacf5..058a0c0382 100644 --- a/tools/integration_tests/shared_chunk_cache/setup_test.go +++ b/tools/integration_tests/shared_chunk_cache/setup_test.go @@ -92,6 +92,6 @@ func TestMain(m *testing.M) { successCode := m.Run() - setup.CleanupDirectoryOnGCS(testEnv.ctx, testEnv.storageClient, path.Join(setup.TestBucket(), testDirName)) + setup.CleanupDirectoryOnGCS(testEnv.ctx, testEnv.storageClient, path.Join(testEnv.cfg.TestBucket, testDirName)) os.Exit(successCode) } diff --git a/tools/integration_tests/shared_chunk_cache/shared_chunk_cache_test.go b/tools/integration_tests/shared_chunk_cache/shared_chunk_cache_test.go index b6677b18a4..e2fadb3a83 100644 --- a/tools/integration_tests/shared_chunk_cache/shared_chunk_cache_test.go +++ b/tools/integration_tests/shared_chunk_cache/shared_chunk_cache_test.go @@ -107,7 +107,7 @@ func (t *BaseSuite) TearDownTest() { if testEnv.cfg.GKEMountedDirectory != "" { // GKE Mode: Just cleanup files - setup.CleanupDirectoryOnGCS(testEnv.ctx, testEnv.storageClient, path.Join(setup.TestBucket(), testDirName)) + setup.CleanupDirectoryOnGCS(testEnv.ctx, testEnv.storageClient, path.Join(testEnv.cfg.TestBucket, testDirName)) } else { // GCE Mode: Unmount and clean up t.unmountAndCleanupMount(t.primaryMount, "primary") @@ -144,7 +144,7 @@ func (t *BaseSuite) mountGcsfuse(mnt mountPoint, mountType string, flags []strin func (t *BaseSuite) unmountAndCleanupMount(m mountPoint, name string) { setup.UnmountGCSFuse(m.mntDir) // Cleaning up the intermediate generated test files. - setup.CleanupDirectoryOnGCS(testEnv.ctx, testEnv.storageClient, path.Join(setup.TestBucket(), testDirName)) + setup.CleanupDirectoryOnGCS(testEnv.ctx, testEnv.storageClient, path.Join(testEnv.cfg.TestBucket, testDirName)) } func (t *BaseSuite) createTestFile(fileName string, fileSize int) { @@ -350,10 +350,10 @@ func RunTests(t *testing.T, runName string, factory func(primaryFlags, secondary for _, cfg := range testEnv.cfg.Configs { if cfg.Run == runName { for i, flagStr := range cfg.Flags { - primaryFlags := strings.Fields(flagStr) + primaryFlags := strings.Split(flagStr, ",") var secondaryFlags []string if len(cfg.SecondaryFlags) > i { - secondaryFlags = strings.Fields(cfg.SecondaryFlags[i]) + secondaryFlags = strings.Split(cfg.SecondaryFlags[i], ",") } suite.Run(t, factory(primaryFlags, secondaryFlags)) } diff --git a/tools/integration_tests/test_config.yaml b/tools/integration_tests/test_config.yaml index 4752bda8ae..752db68ec4 100644 --- a/tools/integration_tests/test_config.yaml +++ b/tools/integration_tests/test_config.yaml @@ -2356,3 +2356,19 @@ concurrent_operations: different_zone: false run: TestConcurrentListing run_on_gke: true + +shared_chunk_cache: + - mounted_directory: "${MOUNTED_DIR}" + mounted_directory_secondary: "${MOUNTED_DIR_SECONDARY}" + test_bucket: "${BUCKET_NAME}" + configs: + - flags: + - "--enable-experimental-shared-chunk-cache,--file-cache-max-size-mb=-1,--cache-dir=/gcsfuse-tmp/shared-cache" + secondary_flags: + - "--enable-experimental-shared-chunk-cache,--file-cache-max-size-mb=-1,--cache-dir=/gcsfuse-tmp/shared-cache" + compatible: + flat: true + hns: true + zonal: true + run: TestSharedChunkCacheTestSuite + run_on_gke: true