Commit b72da4e3 authored by Tomasz Maczukin's avatar Tomasz Maczukin

Update GitLab.com settings with current state

parent 38bf1922
...@@ -72,15 +72,23 @@ The maximum size your Git repository is allowed to be including LFS. ...@@ -72,15 +72,23 @@ The maximum size your Git repository is allowed to be including LFS.
## Shared Runners ## Shared Runners
Shared Runners on GitLab.com run in [autoscale mode] and powered by Shared Runners on GitLab.com run in [autoscale mode] and powered by
DigitalOcean. Autoscaling means reduced waiting times to spin up builds, Google Cloud Platform and DigitalOcean. Autoscaling means reduced
and isolated VMs for each project, thus maximizing security. waiting times to spin up CI/CD jobs, and isolated VMs for each project,
thus maximizing security.
They're free to use for public open source projects and limited to 2000 CI They're free to use for public open source projects and limited to 2000 CI
minutes per month per group for private projects. Read about all minutes per month per group for private projects. Read about all
[GitLab.com plans](https://about.gitlab.com/pricing/). [GitLab.com plans](https://about.gitlab.com/pricing/).
All your builds run on 2GB (RAM) ephemeral instances, with CoreOS and the latest In case of DigitalOcean based Runners, all your CI/CD jobs run on ephemeral
Docker Engine installed. The default region of the VMs is NYC. instances with 2GB of RAM, CoreOS and the latest Docker Engine installed.
Instances provide 2 vCPUs and 60GB of SSD disk space. The default region of the
VMs is NYC1.
In case of Google Cloud Platform based Runners, all your CI/CD jobs run on
ephemeral instances with 3.75GB of RAM, CoreOS and the latest Docker Engine
installed. Instances provide 1 vCPU and 25GB of HDD disk space. The default
region of the VMs is US East1.
Below are the shared Runners settings. Below are the shared Runners settings.
...@@ -88,52 +96,116 @@ Below are the shared Runners settings. ...@@ -88,52 +96,116 @@ Below are the shared Runners settings.
| ----------- | ----------------- | ---------- | | ----------- | ----------------- | ---------- |
| [GitLab Runner] | [Runner versions dashboard][ci_version_dashboard] | - | | [GitLab Runner] | [Runner versions dashboard][ci_version_dashboard] | - |
| Executor | `docker+machine` | - | | Executor | `docker+machine` | - |
| Default Docker image | `ruby:2.1` | - | | Default Docker image | `ruby:2.5` | - |
| `privileged` (run [Docker in Docker]) | `true` | `false` | | `privileged` (run [Docker in Docker]) | `true` | `false` |
[ci_version_dashboard]: https://monitor.gitlab.net/dashboard/db/ci?refresh=5m&orgId=1&panelId=12&fullscreen&from=now-1h&to=now&var-runner_type=All&var-cache_server=All&var-gl_monitor_fqdn=postgres-01.db.prd.gitlab.com&var-has_minutes=yes&var-hanging_droplets_cleaner=All&var-droplet_zero_machines_cleaner=All&var-runner_job_failure_reason=All&theme=light [ci_version_dashboard]: https://monitor.gitlab.net/dashboard/db/ci?from=now-1h&to=now&refresh=5m&orgId=1&panelId=12&fullscreen&theme=light
### `config.toml` ### `config.toml`
The full contents of our `config.toml` are: The full contents of our `config.toml` are:
**DigitalOcean**
```toml ```toml
concurrent = X
check_interval = 1
metrics_server = "X"
sentry_dsn = "X"
[[runners]] [[runners]]
name = "docker-auto-scale" name = "docker-auto-scale"
limit = X
request_concurrency = X request_concurrency = X
url = "https://gitlab.com/ci" url = "https://gitlab.com/"
token = "SHARED_RUNNER_TOKEN" token = "SHARED_RUNNER_TOKEN"
executor = "docker+machine" executor = "docker+machine"
environment = [ environment = [
"DOCKER_DRIVER=overlay2" "DOCKER_DRIVER=overlay2"
] ]
limit = X
[runners.docker] [runners.docker]
image = "ruby:2.1" image = "ruby:2.5"
privileged = true privileged = true
[runners.machine] [runners.machine]
IdleCount = 40 IdleCount = 20
IdleTime = 1800 IdleTime = 1800
OffPeakPeriods = ["* * * * * sat,sun *"]
OffPeakTimezone = "UTC"
OffPeakIdleCount = 5
OffPeakIdleTime = 1800
MaxBuilds = 1 MaxBuilds = 1
MachineName = "srm-%s"
MachineDriver = "digitalocean" MachineDriver = "digitalocean"
MachineName = "machine-%s-digital-ocean-2gb"
MachineOptions = [ MachineOptions = [
"digitalocean-image=coreos-stable", "digitalocean-image=X",
"digitalocean-ssh-user=core", "digitalocean-ssh-user=core",
"digitalocean-access-token=DIGITAL_OCEAN_ACCESS_TOKEN",
"digitalocean-region=nyc1", "digitalocean-region=nyc1",
"digitalocean-size=2gb", "digitalocean-size=s-2vcpu-2gb",
"digitalocean-private-networking", "digitalocean-private-networking",
"digitalocean-userdata=/etc/gitlab-runner/cloudinit.sh", "digitalocean-tags=shared_runners,gitlab_com",
"engine-registry-mirror=http://IP_TO_OUR_REGISTRY_MIRROR" "engine-registry-mirror=http://INTERNAL_IP_OF_OUR_REGISTRY_MIRROR",
"digitalocean-access-token=DIGITAL_OCEAN_ACCESS_TOKEN",
] ]
[runners.cache] [runners.cache]
Type = "s3" Type = "s3"
ServerAddress = "IP_TO_OUR_CACHE_SERVER" BucketName = "runner"
Insecure = true
Shared = true
ServerAddress = "INTERNAL_IP_OF_OUR_CACHE_SERVER"
AccessKey = "ACCESS_KEY" AccessKey = "ACCESS_KEY"
SecretKey = "ACCESS_SECRET_KEY" SecretKey = "ACCESS_SECRET_KEY"
```
**Google Cloud Platform**
```toml
concurrent = X
check_interval = 1
metrics_server = "X"
sentry_dsn = "X"
[[runners]]
name = "docker-auto-scale"
request_concurrency = X
url = "https://gitlab.com/"
token = "SHARED_RUNNER_TOKEN"
executor = "docker+machine"
environment = [
"DOCKER_DRIVER=overlay2"
]
limit = X
[runners.docker]
image = "ruby:2.5"
privileged = true
[runners.machine]
IdleCount = 20
IdleTime = 1800
OffPeakPeriods = ["* * * * * sat,sun *"]
OffPeakTimezone = "UTC"
OffPeakIdleCount = 5
OffPeakIdleTime = 1800
MaxBuilds = 1
MachineName = "srm-%s"
MachineDriver = "google"
MachineOptions = [
"google-project=PROJECT",
"google-disk-size=25",
"google-machine-type=n1-standard-1",
"google-username=core",
"google-tags=gitlab-com,srm",
"google-use-internal-ip",
"google-zone=us-east1-d",
"google-machine-image=PROJECT/global/images/IMAGE",
"engine-registry-mirror=http://INTERNAL_IP_OF_OUR_REGISTRY_MIRROR"
]
[runners.cache]
Type = "s3"
BucketName = "runner" BucketName = "runner"
Insecure = true
Shared = true Shared = true
ServerAddress = "INTERNAL_IP_OF_OUR_CACHE_SERVER"
AccessKey = "ACCESS_KEY"
SecretKey = "ACCESS_SECRET_KEY"
``` ```
## Sidekiq ## Sidekiq
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment