Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2022-12-14 15:08:26 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-12-14 16:11:27 +0300
commit362a1c692293c5e375ac46dfad5ab37faa35d7c1 (patch)
tree2395ab3eb5b4e5eb853aaab6db5d833dd844725f
parent455dd16d8763eeb030dcb893972fafd823cdb9bc (diff)
tests: Remove unneeded seed repositories
Remove infrastructure to clone the "gitlab-test-mirror.git" and "gitlab-git-test.git" seed repositories. They are not used anymore.
-rw-r--r--Makefile14
-rw-r--r--_support/gitlab-git-test.git-packed-refs20
-rw-r--r--doc/test_repos.md1
-rw-r--r--internal/git/gittest/repo.go3
-rw-r--r--ruby/spec/test_repo_helper.rb5
5 files changed, 2 insertions, 41 deletions
diff --git a/Makefile b/Makefile
index 566c83937..18440fb3f 100644
--- a/Makefile
+++ b/Makefile
@@ -234,8 +234,6 @@ TEST_TMP_DIR ?=
TEST_LOG_DIR ?=
TEST_REPO_DIR := ${BUILD_DIR}/testrepos
TEST_REPO := ${TEST_REPO_DIR}/gitlab-test.git
-TEST_REPO_MIRROR := ${TEST_REPO_DIR}/gitlab-test-mirror.git
-TEST_REPO_GIT := ${TEST_REPO_DIR}/gitlab-git-test.git
BENCHMARK_REPO := ${TEST_REPO_DIR}/benchmark.git
# All executables provided by Gitaly.
@@ -362,7 +360,7 @@ prepare-tests: libgit2 prepare-test-repos ${RUBY_BUNDLE_FILE} ${GOTESTSUM} ${GIT
prepare-debug: ${DELVE}
.PHONY: prepare-test-repos
-prepare-test-repos: ${TEST_REPO_MIRROR} ${TEST_REPO} ${TEST_REPO_GIT}
+prepare-test-repos: ${TEST_REPO}
.PHONY: test
## Run Go and Ruby tests.
@@ -710,9 +708,6 @@ ${PROTOC_GEN_GO}: TOOL_PACKAGE = google.golang.org/protobuf/cmd/protoc-gen-g
${PROTOC_GEN_GO_GRPC}:TOOL_PACKAGE = google.golang.org/grpc/cmd/protoc-gen-go-grpc
${DELVE}: TOOL_PACKAGE = github.com/go-delve/delve/cmd/dlv
-${TEST_REPO_MIRROR}:
- ${GIT} clone --mirror ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab-test.git $@
-
${TEST_REPO}:
${GIT} clone --bare ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab-test.git $@
@ # Git notes aren't fetched by default with git clone
@@ -722,12 +717,5 @@ ${TEST_REPO}:
${Q}cp ${SOURCE_DIR}/_support/gitlab-test.git-packed-refs $@/packed-refs
${Q}${GIT} -C $@ fsck --no-progress --no-dangling
-${TEST_REPO_GIT}:
- ${GIT} clone --bare ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab-git-test.git $@
- ${Q}rm -rf $@/refs
- ${Q}mkdir -p $@/refs/heads $@/refs/tags
- ${Q}cp ${SOURCE_DIR}/_support/gitlab-git-test.git-packed-refs $@/packed-refs
- ${Q}${GIT} -C $@ fsck --no-progress --no-dangling
-
${BENCHMARK_REPO}:
${GIT} clone --bare ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab.git $@
diff --git a/_support/gitlab-git-test.git-packed-refs b/_support/gitlab-git-test.git-packed-refs
deleted file mode 100644
index 4fed4130f..000000000
--- a/_support/gitlab-git-test.git-packed-refs
+++ /dev/null
@@ -1,20 +0,0 @@
-# pack-refs with: peeled fully-peeled sorted
-0b4bc9a49b562e85de7cc9e834518ea6828729b9 refs/heads/feature
-12d65c8dd2b2676fa3ac47d955accc085a37a9c1 refs/heads/fix
-6473c90867124755509e100d0d35ebdc85a0b6ae refs/heads/fix-blob-path
-58fa1a3af4de73ea83fe25a1ef1db8e0c56f67e5 refs/heads/fix-existing-submodule-dir
-40f4a7a617393735a95a0bb67b08385bc1e7c66d refs/heads/fix-mode
-9abd6a8c113a2dd76df3fdb3d58a8cec6db75f8d refs/heads/gitattributes
-46e1395e609395de004cacd4b142865ab0e52a29 refs/heads/gitattributes-updated
-4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6 refs/heads/master
-5937ac0a7beb003549fc5fd26fc247adbce4a52e refs/heads/merge-test
-c54ad072fabee9f7bf9b2c6c67089db97ebfbecd refs/heads/rd-add-file-larger-than-1-mb
-4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6 refs/heads/Ääh-test-utf-8
-f4e6814c3e4e7a0de82a9e7cd20c626cc963a2f8 refs/tags/v1.0.0
-^6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
-8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b refs/tags/v1.1.0
-^5937ac0a7beb003549fc5fd26fc247adbce4a52e
-10d64eed7760f2811ee2d64b44f1f7d3b364f17b refs/tags/v1.2.0
-^eb49186cfa5c4338011f5f590fac11bd66c5c631
-2ac1f24e253e08135507d0830508febaaccf02ee refs/tags/v1.2.1
-^fa1b1e6c004a68b7d8763b86455da9e6b23e36d6
diff --git a/doc/test_repos.md b/doc/test_repos.md
index 940fdf82a..651196fe5 100644
--- a/doc/test_repos.md
+++ b/doc/test_repos.md
@@ -6,7 +6,6 @@ second one for free when importing code from `gitlab-ce`.
These repositories get cloned by `make prepare-tests`. They end up in:
- `_build/testrepos/gitlab-test.git`
-- `_build/testrepos/gitlab-git-test.git`
To prevent fragile tests, we use fixed `packed-refs` files for these
repositories. They get installed by make (see `_support/makegen.go`)
diff --git a/internal/git/gittest/repo.go b/internal/git/gittest/repo.go
index b1561a103..acf310535 100644
--- a/internal/git/gittest/repo.go
+++ b/internal/git/gittest/repo.go
@@ -36,9 +36,6 @@ const (
// SeedGitLabTest is the path of the gitlab-test.git repository in _build/testrepos
SeedGitLabTest = "gitlab-test.git"
-
- // SeedGitLabTestMirror is the path of the gitlab-test-mirror.git repository in _build/testrepos
- SeedGitLabTestMirror = "gitlab-test-mirror.git"
)
// InitRepoDir creates a temporary directory for a repo, without initializing it
diff --git a/ruby/spec/test_repo_helper.rb b/ruby/spec/test_repo_helper.rb
index c10445b3a..2a05f2c33 100644
--- a/ruby/spec/test_repo_helper.rb
+++ b/ruby/spec/test_repo_helper.rb
@@ -29,8 +29,6 @@ DEFAULT_STORAGE_DIR = File.join(TMP_DIR, 'repositories', __dir__)
DEFAULT_STORAGE_NAME = 'default'.freeze
TEST_REPO_PATH = File.join(DEFAULT_STORAGE_DIR, 'gitlab-test.git')
TEST_REPO_ORIGIN = '../_build/testrepos/gitlab-test.git'.freeze
-GIT_TEST_REPO_PATH = File.join(DEFAULT_STORAGE_DIR, 'gitlab-git-test.git')
-GIT_TEST_REPO_ORIGIN = '../_build/testrepos/gitlab-git-test.git'.freeze
module TestRepo
def self.prepare_test_repository
@@ -39,8 +37,7 @@ module TestRepo
FileUtils.mkdir_p(DEFAULT_STORAGE_DIR)
{
- TEST_REPO_ORIGIN => TEST_REPO_PATH,
- GIT_TEST_REPO_ORIGIN => GIT_TEST_REPO_PATH
+ TEST_REPO_ORIGIN => TEST_REPO_PATH
}.each do |origin, path|
next if File.directory?(path)