diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 15:42:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 15:42:27 +0000 |
| commit | 8d3556a4acfb53a61f2e18989f614a1c875c598c (patch) | |
| tree | 86f17677ca7e37a158b934591fe91182ccc31839 | |
| parent | 71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e (diff) | |
| download | gitlab-ce-8d3556a4acfb53a61f2e18989f614a1c875c598c.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
| -rw-r--r-- | qa/qa/resource/runner_base.rb | 2 | ||||
| -rw-r--r-- | qa/qa/service/docker_run/gitlab_runner.rb | 2 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/resource/runner_base.rb b/qa/qa/resource/runner_base.rb index 9386a5d9765..399d1153dc2 100644 --- a/qa/qa/resource/runner_base.rb +++ b/qa/qa/resource/runner_base.rb @@ -35,7 +35,7 @@ module QA @config = nil @run_untagged = nil @name = "qa-runner-#{SecureRandom.hex(4)}" - @image = 'registry.gitlab.com/gitlab-org/gitlab-runner:alpine' + @image = 'registry.gitlab.com/gitlab-org/gitlab-runner:alpine-v15.8.3' @executor = :shell @executor_image = 'registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.7' end diff --git a/qa/qa/service/docker_run/gitlab_runner.rb b/qa/qa/service/docker_run/gitlab_runner.rb index d6d1a085b77..a8fcf8f9332 100644 --- a/qa/qa/service/docker_run/gitlab_runner.rb +++ b/qa/qa/service/docker_run/gitlab_runner.rb @@ -16,7 +16,7 @@ module QA MSG def initialize(name) - @image = 'gitlab/gitlab-runner:alpine' + @image = 'gitlab/gitlab-runner:alpine-v15.8.3' @name = name || "qa-runner-#{SecureRandom.hex(4)}" @run_untagged = true @executor = :shell diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb index a504b694308..0f6bee951a7 100644 --- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb @@ -19,7 +19,7 @@ module QA resource.project = project resource.name = runner_name resource.tags = [runner_name] - resource.image = 'gitlab/gitlab-runner:alpine' + resource.image = 'gitlab/gitlab-runner:alpine-v15.8.3' end end |