Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d16d9c57
Commit
d16d9c57
authored
Oct 25, 2021
by
Quang-Minh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix gitaly configuration file for Workhorse integration tests
parent
726cd4f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
.gitlab/ci/workhorse.gitlab-ci.yml
.gitlab/ci/workhorse.gitlab-ci.yml
+3
-2
workhorse/Makefile
workhorse/Makefile
+3
-2
No files found.
.gitlab/ci/workhorse.gitlab-ci.yml
View file @
d16d9c57
...
...
@@ -17,12 +17,13 @@ workhorse:verify:
script
:
-
go version
-
apt-get update && apt-get -y install libimage-exiftool-perl
-
scripts/gitaly-test-build
-
make -C workhorse test
workhorse:test using go 1.16
:
extends
:
.workhorse:test
image
:
${GITLAB_DEPENDENCY_PROXY}golang:1.16
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.16-git-2.31
workhorse:test using go 1.17
:
extends
:
.workhorse:test
image
:
${GITLAB_DEPENDENCY_PROXY}golang:1.17
image
:
registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7-golang-1.17-git-2.31
workhorse/Makefile
View file @
d16d9c57
...
...
@@ -68,6 +68,7 @@ test: prepare-tests
go
test
-tags
"
$(BUILD_TAGS)
"
./...
;
\
status
=
"
$$
?"
;
\
if
[
-f
"
$(GITALY_PID_FILE)
"
]
;
then
\
echo
"Clean up Gitaly server for workhorse integration test"
;
\
kill
-9
$$
(
cat
$(GITALY_PID_FILE)
)
;
\
rm
$(GITALY_PID_FILE)
;
\
else
\
...
...
@@ -105,12 +106,12 @@ $(GITALY_PID_FILE): gitaly.toml
echo
"To run gitaly integration tests set GITALY_ADDRESS=tcp://127.0.0.1:8075"
;
\
else
\
cd
..
;
\
GITALY_TESTING_NO_GIT_HOOKS
=
1
GITALY_PID_FILE
=
$(GITALY_PID_FILE)
$(GITALY)
workhorse/gitaly.toml
;
\
GITALY_TESTING_NO_GIT_HOOKS
=
1
GITALY_PID_FILE
=
workhorse/
$(GITALY_PID_FILE)
$(GITALY)
workhorse/gitaly.toml
;
\
fi
\
}
&
gitaly.toml
:
../tmp/tests/gitaly/config.toml
sed
-e
's/^socket_path.*$$/listen_addr = "0.0.0.0:8075"/'
\
sed
-e
's/^socket_path.*$$/listen_addr = "0.0.0.0:8075"/
;s/^\[auth\]$$//;s/^token.*$$//;s/^internal_socket_dir.*$$//
'
\
$<
>
$@
testdata/data/group/test.git
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment