Commitfceeebc

authored

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

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

2 parents86b0e40 +b87a2bc commitfceeebcCopy full SHA for fceeebc

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines 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`	`deftest_sidekiq_queue_metrics(gl):`
`60`	`60`	`out=gl.sidekiq.queue_metrics()`
`61`	`61`	`assertisinstance(out,dict)`
`62`		`-assert"pages"inout["queues"]`
	`62`	`+assert"default"inout["queues"]`
`63`	`63`
`64`	`64`
`65`	`65`	`deftest_sidekiq_process_metrics(gl):`

Lines 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`	`ifis_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`		`-ifsettings.deletion_adjourned_period!=0:`
`74`		`-logging.info("Setting deletion_adjourned_period to 0")`
`75`		`-settings.deletion_adjourned_period=0`
	`73`	`+modified_settings=False`
	`74`	`+ifsettings.delayed_group_deletion:`
	`75`	+logging.info("Setting `delayed_group_deletion` to False")
	`76`	`+settings.delayed_group_deletion=False`
	`77`	`+modified_settings=True`
	`78`	`+ifsettings.delayed_project_deletion:`
	`79`	+logging.info("Setting `delayed_project_deletion` to False")
	`80`	`+settings.delayed_project_deletion=False`
	`81`	`+modified_settings=True`
	`82`	`+ifmodified_settings:`
`76`	`83`	`settings.save()`
`77`	`84`
`78`	`85`	`forprojectingl.projects.list():`

Lines 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`

Comments

(0)