diff options
| author | Yaya <mak@nyantec.com> | 2023-06-20 09:49:47 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-06-29 11:18:35 +0000 |
| commit | 68dc17de9bb8a02120d63b3fe787e77a1cab8ca6 (patch) | |
| tree | 662840b6b2e38cd5b3345d30478d5ce8d1d1453d | |
| parent | gitlab-container-registry: 3.76.0 -> 3.77.0 (diff) | |
| download | nixpkgs-origin/backport-238555-to-release-23.05.tar.gz | |
gitlab-container-registry: Disable a flaky testorigin/backport-238555-to-release-23.05
(cherry picked from commit d1cd3b1dcffbcf20fceedf7578a1ff1c86e2dd41)
2 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch b/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch new file mode 100644 index 000000000000..16f47fb3ae18 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch @@ -0,0 +1,38 @@ +From bc359e8f51a17ba759121339e87e90eed16e98fe Mon Sep 17 00:00:00 2001 +From: Yaya <mak@nyantec.com> +Date: Tue, 20 Jun 2023 10:01:23 +0000 +Subject: [PATCH] Disable inmemory storage driver test + +--- + .../storage/driver/inmemory/driver_test.go | 19 ------------------- + 1 file changed, 19 deletions(-) + delete mode 100644 registry/storage/driver/inmemory/driver_test.go + +diff --git a/registry/storage/driver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go +deleted file mode 100644 +index dbc1916f..00000000 +--- a/registry/storage/driver/inmemory/driver_test.go ++++ /dev/null +@@ -1,19 +0,0 @@ +-package inmemory +- +-import ( +- "testing" +- +- storagedriver "github.com/docker/distribution/registry/storage/driver" +- "github.com/docker/distribution/registry/storage/driver/testsuites" +- "gopkg.in/check.v1" +-) +- +-// Hook up gocheck into the "go test" runner. +-func Test(t *testing.T) { check.TestingT(t) } +- +-func init() { +- inmemoryDriverConstructor := func() (storagedriver.StorageDriver, error) { +- return New(), nil +- } +- testsuites.RegisterSuite(inmemoryDriverConstructor, testsuites.NeverSkip) +-} +-- +2.40.1 + diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index d2db2c820ea3..17a186ef25e4 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -14,6 +14,10 @@ buildGoModule rec { vendorHash = "sha256-/ITZBh0vRYHb6fDUZQNRwW2pmQulJlDZ8EbObUBtsz4="; + patches = [ + ./Disable-inmemory-storage-driver-test.patch + ]; + postPatch = '' substituteInPlace health/checks/checks_test.go \ --replace \ |