From 6d1fedb6c7d47613a9a880c9a062a9624c63248d Mon Sep 17 00:00:00 2001 From: Prince Kumar Date: Fri, 17 May 2024 10:38:45 +0000 Subject: [PATCH 1/4] Disabling the grpc test --- .../implicit_dir/implicit_dir_test.go | 10 ++++++---- tools/integration_tests/operations/operations_test.go | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/integration_tests/implicit_dir/implicit_dir_test.go b/tools/integration_tests/implicit_dir/implicit_dir_test.go index b8ed344747..06819f2595 100644 --- a/tools/integration_tests/implicit_dir/implicit_dir_test.go +++ b/tools/integration_tests/implicit_dir/implicit_dir_test.go @@ -50,11 +50,13 @@ func TestMain(m *testing.M) { log.Fatalf("client.CreateStorageClient: %v", err) } - flags := [][]string{ - {"--implicit-dirs"}, - {"--client-protocol=grpc", "--implicit-dirs=true"}} + flagsSet := [][]string{{"--implicit-dirs"}} - successCode := implicit_and_explicit_dir_setup.RunTestsForImplicitDirAndExplicitDir(flags, m) + if !testing.Short() { + flagsSet = append(flagsSet, []string{"--client-protocol=grpc", "--implicit-dirs=true"}) + } + + successCode := implicit_and_explicit_dir_setup.RunTestsForImplicitDirAndExplicitDir(flagsSet, m) // Close storage client and release resources. storageClient.Close() diff --git a/tools/integration_tests/operations/operations_test.go b/tools/integration_tests/operations/operations_test.go index f16ffe82df..a44c8cbf7a 100644 --- a/tools/integration_tests/operations/operations_test.go +++ b/tools/integration_tests/operations/operations_test.go @@ -142,11 +142,11 @@ func TestMain(m *testing.M) { // By default, creating emptyFile is disabled. {"--implicit-dirs=true"}, {"--implicit-dirs=false"}, - {"--experimental-enable-json-read=true", "--implicit-dirs=true"}, - {"--client-protocol=grpc", "--implicit-dirs=true"}} + {"--experimental-enable-json-read=true", "--implicit-dirs=true"}} if !testing.Short() { flagsSet = append(flagsSet, []string{"--client-protocol=grpc", "--implicit-dirs=false"}) + flagsSet = append(flagsSet, []string{"--client-protocol=grpc", "--implicit-dirs=true"}) } mountConfigFlags := createMountConfigsAndEquivalentFlags() From 3b626f374dd9a446fb03897b3941e63d8e0eb933 Mon Sep 17 00:00:00 2001 From: Prince Kumar Date: Fri, 17 May 2024 10:41:19 +0000 Subject: [PATCH 2/4] Disabling grpc in the periodic tests --- .../scripts/continuous_test/gcp_ubuntu/e2e_tests/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/build.sh b/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/build.sh index 0900940813..e55fa43120 100755 --- a/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/build.sh +++ b/perfmetrics/scripts/continuous_test/gcp_ubuntu/e2e_tests/build.sh @@ -18,6 +18,7 @@ set -e readonly RUN_E2E_TESTS_ON_INSTALLED_PACKAGE=true +readonly SKIP_NON_ESSENTIAL_TESTS_ON_PACKAGE=true cd "${KOKORO_ARTIFACTS_DIR}/github/gcsfuse" echo "Building and installing gcsfuse..." @@ -30,4 +31,4 @@ git checkout $commitId echo "Running e2e tests on installed package...." # $1 argument is refering to value of testInstalledPackage -./tools/integration_tests/run_e2e_tests.sh $RUN_E2E_TESTS_ON_INSTALLED_PACKAGE +./tools/integration_tests/run_e2e_tests.sh $RUN_E2E_TESTS_ON_INSTALLED_PACKAGE $SKIP_NON_ESSENTIAL_TESTS_ON_PACKAGE From e166fe71db63b6f097deb3639a631a1eb723dd0b Mon Sep 17 00:00:00 2001 From: Prince Kumar Date: Fri, 17 May 2024 11:11:56 +0000 Subject: [PATCH 3/4] review comments --- tools/integration_tests/operations/operations_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/integration_tests/operations/operations_test.go b/tools/integration_tests/operations/operations_test.go index a44c8cbf7a..9d2a947773 100644 --- a/tools/integration_tests/operations/operations_test.go +++ b/tools/integration_tests/operations/operations_test.go @@ -145,7 +145,6 @@ func TestMain(m *testing.M) { {"--experimental-enable-json-read=true", "--implicit-dirs=true"}} if !testing.Short() { - flagsSet = append(flagsSet, []string{"--client-protocol=grpc", "--implicit-dirs=false"}) flagsSet = append(flagsSet, []string{"--client-protocol=grpc", "--implicit-dirs=true"}) } From 0a6dfc4bb373fde3d7ad135342ac33f1a34c98fd Mon Sep 17 00:00:00 2001 From: Prince Kumar Date: Fri, 17 May 2024 11:59:37 +0000 Subject: [PATCH 4/4] skipping the grpc test in louhi pipeline --- tools/cd_scripts/e2e_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cd_scripts/e2e_test.sh b/tools/cd_scripts/e2e_test.sh index aee59c4c0c..25ba54f6b6 100755 --- a/tools/cd_scripts/e2e_test.sh +++ b/tools/cd_scripts/e2e_test.sh @@ -139,7 +139,7 @@ git checkout $(sed -n 2p ~/details.txt) |& tee -a ~/logs.txt #run tests with testbucket flag set +e -GODEBUG=asyncpreemptoff=1 CGO_ENABLED=0 go test ./tools/integration_tests/... -p 1 --integrationTest -v --testbucket=$(sed -n 3p ~/details.txt) --testInstalledPackage --timeout=60m &>> ~/logs.txt +GODEBUG=asyncpreemptoff=1 CGO_ENABLED=0 go test ./tools/integration_tests/... -p 1 -short --integrationTest -v --testbucket=$(sed -n 3p ~/details.txt) --testInstalledPackage --timeout=60m &>> ~/logs.txt if [ $? -ne 0 ]; then