Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2dda9dc

Browse files
JohnVillalovosnejch
authored andcommitted
ci: use gitlab-runner:v17.7.1 for the CI
The `latest` gitlab-runner image does not have the `gitlab-runner` user and it causes our tests to fail. Closes: #3091
1 parent 671e711 commit 2dda9dc

File tree

4 files changed

+16
-1
lines changed

4 files changed

+16
-1
lines changed

.renovaterc.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@
2323
"depNameTemplate": "gitlab/gitlab-ee",
2424
"datasourceTemplate": "docker",
2525
"versioningTemplate": "loose"
26+
},
27+
{
28+
"fileMatch": [
29+
"(^|/)tests\\/functional\\/fixtures\\/\\.env$"
30+
],
31+
"matchStrings": [
32+
"GITLAB_RUNNER_TAG=(?<currentValue>.*?)\n"
33+
],
34+
"depNameTemplate": "gitlab/gitlab-runner",
35+
"datasourceTemplate": "docker",
36+
"versioningTemplate": "loose"
2637
}
2738
],
2839
"packageRules": [

tests/functional/fixtures/.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
GITLAB_IMAGE=gitlab/gitlab-ee
22
GITLAB_TAG=17.7.1-ee.0
3+
GITLAB_RUNNER_IMAGE=gitlab/gitlab-runner
4+
GITLAB_RUNNER_TAG=v17.7.1

tests/functional/fixtures/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ services:
4545
- gitlab-network
4646

4747
gitlab-runner:
48-
image: gitlab/gitlab-runner:latest
48+
image: '${GITLAB_RUNNER_IMAGE}:${GITLAB_RUNNER_TAG}'
4949
container_name: 'gitlab-runner-test'
5050
depends_on:
5151
- gitlab

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ passenv =
2121
GITHUB_WORKSPACE
2222
GITLAB_IMAGE
2323
GITLAB_TAG
24+
GITLAB_RUNNER_IMAGE
25+
GITLAB_RUNNER_TAG
2426
NO_COLOR
2527
PWD
2628
PY_COLORS

0 commit comments

Comments
 (0)