Merge pull request #2280 from python-gitlab/jlvillal/docker_image · python-gitlab/python-gitlab@fceeebc · GitHub

1. python-gitlab
2. python-gitlab

Repository navigation

• Code
• Issues16 (16)
• Pull requests15 (15)
• Discussions
• Actions
• Projects
• Security and quality
• Insights

Commit fceeebc

Browse filesBrowse the repository at this point in the historyBrowse files

nejch

authored

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

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

2 parents 86b0e40 + b87a2bc commit fceeebc
Copy full SHA for fceeebc

3 files changed

+13-6Lines changed: 13 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tests/functional
  • api
    • test_gitlab.py
  • conftest.py
  • fixtures
    • .env

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tests/functional/api/test_gitlab.py‎

Copy file name to clipboardExpand all lines: tests/functional/api/test_gitlab.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -59,7 +59,7 @@ def test_lint(gl):
59	59	def test_sidekiq_queue_metrics(gl):
60	60	out = gl.sidekiq.queue_metrics()
61	61	assert isinstance(out, dict)
62		- assert "pages" in out["queues"]
	62	+ assert "default" in out["queues"]
63	63
64	64
65	65	def test_sidekiq_process_metrics(gl):

Collapse file

‎tests/functional/conftest.py‎

Copy file name to clipboardExpand all lines: tests/functional/conftest.py

+11-4Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -68,11 +68,18 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None:
68	68	if is_gitlab_ee(gl):
69	69	logging.info("GitLab EE detected")
70	70	# NOTE(jlvillal): By default in GitLab EE it will wait 7 days before
71		- # deleting a group. Change it to 0 days.
	71	+ # deleting a group. Disable delayed group/project deletion.
72	72	settings = gl.settings.get()
73		- if settings.deletion_adjourned_period != 0:
74		- logging.info("Setting deletion_adjourned_period to 0")
75		- settings.deletion_adjourned_period = 0
	73	+ modified_settings = False
	74	+ if settings.delayed_group_deletion:
	75	+ logging.info("Setting `delayed_group_deletion` to False")
	76	+ settings.delayed_group_deletion = False
	77	+ modified_settings = True
	78	+ if settings.delayed_project_deletion:
	79	+ logging.info("Setting `delayed_project_deletion` to False")
	80	+ settings.delayed_project_deletion = False
	81	+ modified_settings = True
	82	+ if modified_settings:
76	83	settings.save()
77	84
78	85	for project in gl.projects.list():

Collapse file

‎tests/functional/fixtures/.env‎

Copy file name to clipboard

+1-1Lines changed: 1 addition & 1 deletion

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

0 commit comments

Comments

0 (0)