From b29edbb785b34f5c0975e517211f76d87bf28a09 Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Mon, 19 Sep 2022 15:57:12 +0200 Subject: featureflag: Remove git_v2371gl1 flag Version 2.37.1-gl1 is been the default for more than one release. It's time to remove the feature flag. Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/4192 --- internal/git/command_factory_test.go | 2 -- internal/git/execution_environment.go | 3 --- internal/metadata/featureflag/ff_git_v2371.go | 9 --------- internal/testhelper/testhelper.go | 3 --- 4 files changed, 17 deletions(-) delete mode 100644 internal/metadata/featureflag/ff_git_v2371.go diff --git a/internal/git/command_factory_test.go b/internal/git/command_factory_test.go index f20863535..c0af1134b 100644 --- a/internal/git/command_factory_test.go +++ b/internal/git/command_factory_test.go @@ -20,7 +20,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/v15/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v15/internal/metadata/featureflag" "gitlab.com/gitlab-org/gitaly/v15/internal/testhelper" "gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg" ) @@ -220,7 +219,6 @@ func TestCommandFactory_ExecutionEnvironment(t *testing.T) { }) t.Run("set using GITALY_TESTING_BUNDLED_GIT_PATH", func(t *testing.T) { - ctx := featureflag.ContextWithFeatureFlag(ctx, featureflag.GitV2371Gl1, true) suffix := "-v2.37.1.gl1" bundledGitDir := testhelper.TempDir(t) diff --git a/internal/git/execution_environment.go b/internal/git/execution_environment.go index 9de1a0b94..a9dd404b2 100644 --- a/internal/git/execution_environment.go +++ b/internal/git/execution_environment.go @@ -27,9 +27,6 @@ var ( ExecutionEnvironmentConstructors = []ExecutionEnvironmentConstructor{ BundledGitEnvironmentConstructor{ Suffix: "-v2.37.1.gl1", - FeatureFlags: []featureflag.FeatureFlag{ - featureflag.GitV2371Gl1, - }, }, BundledGitEnvironmentConstructor{ Suffix: "-v2.35.1.gl1", diff --git a/internal/metadata/featureflag/ff_git_v2371.go b/internal/metadata/featureflag/ff_git_v2371.go deleted file mode 100644 index 86e665a31..000000000 --- a/internal/metadata/featureflag/ff_git_v2371.go +++ /dev/null @@ -1,9 +0,0 @@ -package featureflag - -// GitV2371Gl1 will enable use of Git v2.37.1.gl1. -var GitV2371Gl1 = NewFeatureFlag( - "git_v2371gl1", - "v15.0.0", - "https://gitlab.com/gitlab-org/gitaly/-/issues/4194", - true, -) diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index 2599eed26..44f691452 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -175,9 +175,6 @@ func ContextWithoutCancel(opts ...ContextOpt) context.Context { // deep in the call stack, so almost every test function would have to inject it into its // context. ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.RunCommandsInCGroup, true) - // Randomly inject the Git flag so that we have coverage of tests with both old and new Git - // version by pure chance. - ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.GitV2371Gl1, rnd.Int()%2 == 0) // PraefectGeneratedReplicaPaths affects many tests as it changes the repository creation logic. // Randomly enable the flag to exercise both paths to some extent. ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.PraefectGeneratedReplicaPaths, rnd.Int()%2 == 0) -- cgit v1.2.3