diff options
| author | karthik nayak <knayak@gitlab.com> | 2022-09-19 18:45:25 +0300 |
|---|---|---|
| committer | karthik nayak <knayak@gitlab.com> | 2022-09-19 18:45:25 +0300 |
| commit | 89921e69237f7f4bd09dd430ecbbdb991d3a43be (patch) | |
| tree | 63638223e870331a01978939926a91d56ef7e97b | |
| parent | f39f02c9dd07a80ed1443d42bbf158bed901c777 (diff) | |
| parent | cc04215ebe0904c7be424b718761bbb4501fd4b1 (diff) | |
Merge branch 'remove-ff-git237' into 'master'
featureflag: Delete flag `GitV2371Gl1`
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4874
Merged-by: karthik nayak <knayak@gitlab.com>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Toon Claes <toon@gitlab.com>
| -rw-r--r-- | internal/git/command_factory_test.go | 2 | ||||
| -rw-r--r-- | internal/git/execution_environment.go | 6 | ||||
| -rw-r--r-- | internal/metadata/featureflag/ff_git_v2371.go | 9 | ||||
| -rw-r--r-- | internal/testhelper/testhelper.go | 3 |
4 files changed, 0 insertions, 20 deletions
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..b313dce85 100644 --- a/internal/git/execution_environment.go +++ b/internal/git/execution_environment.go @@ -27,12 +27,6 @@ var ( ExecutionEnvironmentConstructors = []ExecutionEnvironmentConstructor{ BundledGitEnvironmentConstructor{ Suffix: "-v2.37.1.gl1", - FeatureFlags: []featureflag.FeatureFlag{ - featureflag.GitV2371Gl1, - }, - }, - BundledGitEnvironmentConstructor{ - Suffix: "-v2.35.1.gl1", }, DistributedGitEnvironmentConstructor{}, } 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) |