Skip to content

chore: bump GitLab docker image to 15.4.0-ee.0 #2280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nejch merged 1 commit into from
Sep 23, 2022
Merged

chore: bump GitLab docker image to 15.4.0-ee.0 #2280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/functional/api/test_gitlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def test_lint(gl):
def test_sidekiq_queue_metrics(gl):
out = gl.sidekiq.queue_metrics()
assert isinstance(out, dict)
assert "pages" in out["queues"]
assert "default" in out["queues"]


def test_sidekiq_process_metrics(gl):
Expand Down
15 changes: 11 additions & 4 deletions tests/functional/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,18 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None:
if is_gitlab_ee(gl):
logging.info("GitLab EE detected")
# NOTE(jlvillal): By default in GitLab EE it will wait 7 days before
# deleting a group. Change it to 0 days.
# deleting a group. Disable delayed group/project deletion.
settings = gl.settings.get()
if settings.deletion_adjourned_period != 0:
logging.info("Setting deletion_adjourned_period to 0")
settings.deletion_adjourned_period = 0
modified_settings = False
if settings.delayed_group_deletion:
logging.info("Setting `delayed_group_deletion` to False")
settings.delayed_group_deletion = False
modified_settings = True
if settings.delayed_project_deletion:
logging.info("Setting `delayed_project_deletion` to False")
settings.delayed_project_deletion = False
modified_settings = True
if modified_settings:
settings.save()

for project in gl.projects.list():
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/fixtures/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
GITLAB_IMAGE=gitlab/gitlab-ee
GITLAB_TAG=15.2.0-ee.0
GITLAB_TAG=15.4.0-ee.0