Merge pull request #2280 from python-gitlab/jlvillal/docker_image

nejch · web-flow · commit fceeebc441d4 · 2022-09-23T23:39:09.000+02:00
chore: bump GitLab docker image to 15.4.0-ee.0
diff --git a/tests/functional/api/test_gitlab.py b/tests/functional/api/test_gitlab.py
@@ -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):
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -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():
diff --git a/tests/functional/fixtures/.env b/tests/functional/fixtures/.env
@@ -1,2 +1,2 @@
 GITLAB_IMAGE=gitlab/gitlab-ee
-GITLAB_TAG=15.2.0-ee.0
+GITLAB_TAG=15.4.0-ee.0

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`GITLAB_IMAGE=gitlab/gitlab-ee`
`2`		`-GITLAB_TAG=15.2.0-ee.0`
	`2`	`+GITLAB_TAG=15.4.0-ee.0`