Skip to content

Commit d58a72c

Browse files
abartletmetze-samba
authored andcommitted
.gitlab-ci: Remove tags no longer provided by gitlab.com
GitLab.com removed a number of tags from their hosted runners and this meant our CI was being redirected to our private runners at a larger cost to the Samba Team. The new infrastructure is much larger than when we last selected runners so we can just use the default, even for the code coverage build. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15638 Pair-Programmed-With: Stefan Metzmacher <[email protected]> Signed-off-by: Andrew Bartlett <[email protected]> Signed-off-by: Stefan Metzmacher <[email protected]> Reviewed-by: Andreas Schneider <[email protected]> Autobuild-User(master): Stefan Metzmacher <[email protected]> Autobuild-Date(master): Tue May 7 13:40:55 UTC 2024 on atb-devel-224
1 parent 87e31f8 commit d58a72c

File tree

2 files changed

+12
-40
lines changed

2 files changed

+12
-40
lines changed

.gitlab-ci-coverage-runners.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
include:
22
- /.gitlab-ci-default-runners.yml
33

4-
.shared_runner_test:
5-
# We need the more powerful n1-standard-2 runners
6-
# in order to handle the lcov overhead.
7-
#
8-
# See .gitlab-ci-default-runners.yml for more details
9-
tags:
10-
- gitlab-org-docker
4+
# Currently we're happy with the defaults

.gitlab-ci-default-runners.yml

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,26 @@
1-
# From https://docs.gitlab.com/ee/user/gitlab_com/#shared-runners:
1+
# From https://docs.gitlab.com/ee/ci/runners/hosted_runners/linux.html
22
#
33
# ...
44
#
5-
# All your CI/CD jobs run on n1-standard-1 instances with 3.75GB of RAM, CoreOS
6-
# and the latest Docker Engine installed. Instances provide 1 vCPU and 25GB of
7-
# HDD disk space. The default region of the VMs is US East1. Each instance is
8-
# used only for one job, this ensures any sensitive data left on the system can’t
9-
# be accessed by other people their CI jobs.
10-
#
11-
# The gitlab-shared-runners-manager-X.gitlab.com fleet of runners are dedicated
12-
# for GitLab projects as well as community forks of them. They use a slightly
13-
# larger machine type (n1-standard-2) and have a bigger SSD disk size. They don’t
14-
# run untagged jobs and unlike the general fleet of shared runners, the instances
15-
# are re-used up to 40 times.
16-
#
17-
# ...
18-
#
19-
# The n1-standard-1 runners seem to be tagged with 'docker' together with 'gce'.
20-
#
21-
# The more powerful n1-standard-2 runners seem to be tagged with
22-
# 'gitlab-org-docker' or some with just 'gitlab-org'.
23-
#
5+
# Runner Tag vCPUs Memory Storage
6+
# saas-linux-small-amd64 2 8 GB 25 GB
247
#
258
# Our current private runner 'docker', 'samba-ci-private', 'shared' and
269
# 'ubuntu2204'. It runs with an ubuntu2204 kernel (5.15) and provides an
27-
# ext4 filesystem and similar RAM as the n1-standard-2 runners.
10+
# ext4 filesystem, 2 CPU and 4 GB (shared tag) 8G (samba-ci-private tag) RAM.
2811
#
2912

3013
.shared_runner_build:
31-
# We use n1-standard-1 shared runners by default.
32-
#
33-
# There are currently 5 shared runners with 'docker' and 'gce',
34-
# while there are only 2 provising 'docker' together with 'shared'.
14+
# We use saas-linux-small-amd64 shared runners by default.
15+
# We avoid adding explicit tags for them in order
16+
# to work with potential changes in future
3517
#
36-
# We used to fallback to our private runner if the docker+shared runners
37-
# were busy, but now that we use the 5 docker+gce runners, we try to only
38-
# use shared runners without a fallback to our private runner!
39-
# Lets see how that will work out.
40-
tags:
41-
- docker
42-
- gce
18+
# In order to generate valid yaml, we define a dummy variable...
19+
variables:
20+
SAMBA_SHARED_RUNNER_BUILD_DUMMY_VARIABLE: shared_runner_build
4321

4422
.shared_runner_test:
45-
# Currently we're fine using the n1-standard-1 runners also for testing
23+
# We use saas-linux-small-amd64 shared runners by default.
4624
extends: .shared_runner_build
4725

4826
.private_runner_test:

0 commit comments

Comments
 (0)