diff --git a/federation/federation.sh b/federation/federation.sh index e3e7ab7a..0a841901 100755 --- a/federation/federation.sh +++ b/federation/federation.sh @@ -66,7 +66,7 @@ function federation_teardown() { } function test_federation() { - # start_gitlab octobus/heptapod:1.5.3 + # start_gitlab gitlab/gitlab-ce:17.1.0-ce.0 federation_setup_variables local versions="${1:-$RELEASE_NUMBERS}" diff --git a/lib/lib.sh b/lib/lib.sh index 590e082a..1750eb79 100644 --- a/lib/lib.sh +++ b/lib/lib.sh @@ -204,7 +204,6 @@ function start_gitlab() { for i in $(seq 10); do 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$serial gitlab-rails runner "Gitlab::CurrentSettings.current_application_settings.update(default_vcs_type: 'git')" log_info "GitLab is ready" return fi