Skip to content

ci: use gitlab-runner:v17.7.1 for the CI #3093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 22, 2025
Merged

ci: use gitlab-runner:v17.7.1 for the CI #3093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
553f5b0
ci: use gitlab-runner:v17.7.1 for the CI
JohnVillalovos Jan 22, 2025
5e169be
chore(test): prevent 'job_with_artifact' fixture running forever
JohnVillalovos Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .renovaterc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
"depNameTemplate": "gitlab/gitlab-ee",
"datasourceTemplate": "docker",
"versioningTemplate": "loose"
},
{
"fileMatch": [
"(^|/)tests\\/functional\\/fixtures\\/\\.env$"
],
"matchStrings": [
"GITLAB_RUNNER_TAG=(?<currentValue>.*?)\n"
],
"depNameTemplate": "gitlab/gitlab-runner",
"datasourceTemplate": "docker",
"versioningTemplate": "loose"
}
],
"packageRules": [
Expand Down
11 changes: 11 additions & 0 deletions tests/functional/cli/test_cli_artifacts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import logging
import subprocess
import textwrap
import time
Expand All @@ -24,12 +25,22 @@

@pytest.fixture(scope="module")
def job_with_artifacts(gitlab_runner, project):
start_time = time.time()

project.files.create(data)

jobs = None
while not jobs:
time.sleep(0.5)
jobs = project.jobs.list(scope="success")
if time.time() - start_time < 60:
continue
logging.error("job never succeeded")
for job in project.jobs.list():
job = project.jobs.get(job.id)
logging.info(f"{job.status} job: {job.pformat()}")
logging.info(f"job log:\n{job.trace()}\n")
pytest.fail("Fixture 'job_with_artifact' failed")

return project.jobs.get(jobs[0].id)

Expand Down
2 changes: 2 additions & 0 deletions tests/functional/fixtures/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
GITLAB_IMAGE=gitlab/gitlab-ee
GITLAB_TAG=17.7.1-ee.0
GITLAB_RUNNER_IMAGE=gitlab/gitlab-runner
GITLAB_RUNNER_TAG=v17.7.1
2 changes: 1 addition & 1 deletion tests/functional/fixtures/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
- gitlab-network

gitlab-runner:
image: gitlab/gitlab-runner:latest
image: '${GITLAB_RUNNER_IMAGE}:${GITLAB_RUNNER_TAG}'
container_name: 'gitlab-runner-test'
depends_on:
- gitlab
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ passenv =
GITHUB_WORKSPACE
GITLAB_IMAGE
GITLAB_TAG
GITLAB_RUNNER_IMAGE
GITLAB_RUNNER_TAG
NO_COLOR
PWD
PY_COLORS
Expand Down
Loading