fix: Heptapod is not longer available
The default_vcs_type setting is Heptapod specific and cannot be used for GitLab. Refs: https://code.forgejo.org/f3/gof3/issues/88
This commit is contained in:
parent
c29e1e64e7
commit
7abcd0e280
2 changed files with 1 additions and 2 deletions
|
|
@ -66,7 +66,7 @@ function federation_teardown() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function test_federation() {
|
function test_federation() {
|
||||||
# start_gitlab octobus/heptapod:1.5.3
|
# start_gitlab gitlab/gitlab-ce:17.1.0-ce.0
|
||||||
federation_setup_variables
|
federation_setup_variables
|
||||||
|
|
||||||
local versions="${1:-$RELEASE_NUMBERS}"
|
local versions="${1:-$RELEASE_NUMBERS}"
|
||||||
|
|
|
||||||
|
|
@ -204,7 +204,6 @@ function start_gitlab() {
|
||||||
for i in $(seq 10); do
|
for i in $(seq 10); do
|
||||||
if test $(curl --silent http://$IP:$GITLAB_PORT -o /dev/null -w "%{http_code}") = 302; then
|
if test $(curl --silent http://$IP:$GITLAB_PORT -o /dev/null -w "%{http_code}") = 302; then
|
||||||
docker exec test-gitlab gitlab-rails runner "user = User.find_by_username 'root'; user.password = '$GITLAB_PASSWORD'; user.password_confirmation = '$GITLAB_PASSWORD'; user.password_automatically_set = false ; user.save!"
|
docker exec test-gitlab gitlab-rails runner "user = User.find_by_username 'root'; user.password = '$GITLAB_PASSWORD'; user.password_confirmation = '$GITLAB_PASSWORD'; user.password_automatically_set = false ; user.save!"
|
||||||
docker exec test-gitlab$serial gitlab-rails runner "Gitlab::CurrentSettings.current_application_settings.update(default_vcs_type: 'git')"
|
|
||||||
log_info "GitLab is ready"
|
log_info "GitLab is ready"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue