Merge branch 'docs-shared-runners-quota' into 'master'
Move shared minutes purchase details to /subscription Closes #63461 See merge request gitlab-org/gitlab-ce!31753
This commit is contained in:
commit
8ae75677a3
|
@ -16,7 +16,7 @@ through the [continuous methodologies](introduction/index.md#introduction-to-cic
|
|||
NOTE: **Out-of-the-box management systems can decrease hours spent on maintaining toolchains by 10% or more.**
|
||||
Watch our
|
||||
["Mastering continuous software development"](https://about.gitlab.com/webcast/mastering-ci-cd/)
|
||||
webcast to learn about continuous methods and how GitLab’s built-in CI can help you simplify and scale software development.
|
||||
webcast to learn about continuous methods and how GitLab’s built-in CI can help you simplify and scale software development.
|
||||
|
||||
## Overview
|
||||
|
||||
|
@ -67,11 +67,11 @@ to your needs:
|
|||
For a broader overview, see the [CI/CD getting started](quick_start/README.md) guide.
|
||||
|
||||
Once you're familiar with how GitLab CI/CD works, see the
|
||||
[`. gitlab-ci.yml` full reference](yaml/README.md)
|
||||
[`.gitlab-ci.yml` full reference](yaml/README.md)
|
||||
for all the attributes you can set and use.
|
||||
|
||||
NOTE: **Note:**
|
||||
GitLab CI/CD and [shared runners](runners/README.md#shared-specific-and-group-runners) are enabled in GitLab.com and available for all users, limited only to the [user's pipelines quota](../user/admin_area/settings/continuous_integration.md#extra-shared-runners-pipeline-minutes-quota-free-only).
|
||||
GitLab CI/CD and [shared runners](runners/README.md#shared-specific-and-group-runners) are enabled in GitLab.com and available for all users, limited only to the [user's pipelines quota](../user/gitlab_com/index.md#shared-runners).
|
||||
|
||||
## Configuration
|
||||
|
||||
|
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
@ -221,6 +221,52 @@ The following table describes details of your subscription for groups:
|
|||
| Subscription start date | Date your subscription started. If this is for a Free plan, is the date you transitioned off your group's paid plan. |
|
||||
| Subscription end date | Date your current subscription will end. Does not apply to Free plans. |
|
||||
|
||||
#### Extra Shared Runners pipeline minutes
|
||||
|
||||
If you're using GitLab.com, you can purchase additional CI minutes so your
|
||||
pipelines will not be blocked after you have used all your CI minutes from your
|
||||
main quota. Additional minutes:
|
||||
|
||||
- Are only used once the shared quota included in your subscription runs out.
|
||||
- Roll over month to month.
|
||||
|
||||
In order to purchase additional minutes, you should follow these steps:
|
||||
|
||||
1. Go to **Group > Settings > Pipelines quota**. Once you are on that page, click on **Buy additional minutes**.
|
||||
|
||||
![Buy additional minutes](img/buy_btn.png)
|
||||
|
||||
1. Locate the subscription card that is linked to your group on GitLab.com,
|
||||
click on **Buy more CI minutes**, and complete the details about the transaction.
|
||||
|
||||
![Buy additional minutes](img/buy_minutes_card.png)
|
||||
|
||||
1. Once we have processed your payment, the extra CI minutes
|
||||
will be synced to your Group and you can visualize it from the
|
||||
**Group > Settings > Pipelines quota** page:
|
||||
|
||||
![Additional minutes](img/additional_minutes.png)
|
||||
|
||||
Be aware that:
|
||||
|
||||
1. If you have purchased extra CI minutes before the purchase of a paid plan,
|
||||
we will calculate a pro-rated charge for your paid plan. That means you may
|
||||
be charged for less than one year since your subscription was previously
|
||||
created with the extra CI minutes.
|
||||
1. Once the extra CI minutes has been assigned to a Group they cannot be transferred
|
||||
to a different Group.
|
||||
1. If you have some minutes used over your default quota, these minutes will
|
||||
be deducted from your Additional Minutes quota immediately after your purchase of additional
|
||||
minutes.
|
||||
|
||||
##### What happens when my CI minutes run out
|
||||
|
||||
When the CI minutes run out, an email is sent automatically to notify the owner(s)
|
||||
of the group/namespace, including a link to [purchase more minutes](https://customers.gitlab.com/plans).
|
||||
|
||||
If you are not the owner of the group, you will need to contact them to let them know they need to
|
||||
[purchase more minutes](https://customers.gitlab.com/plans).
|
||||
|
||||
## Subscription changes and your data
|
||||
|
||||
When your subscription or trial expires, GitLab does not delete your data.
|
||||
|
|
|
@ -94,52 +94,6 @@ a group in the **Usage Quotas** page available to the group page settings list.
|
|||
|
||||
![Group pipelines quota](img/group_pipelines_quota.png)
|
||||
|
||||
## Extra Shared Runners pipeline minutes quota **(FREE ONLY)**
|
||||
|
||||
If you're using GitLab.com, you can purchase additional CI minutes so your
|
||||
pipelines will not be blocked after you have used all your CI minutes from your
|
||||
main quota. Additional minutes:
|
||||
|
||||
- Are only used once the shared quota included in your subscription runs out.
|
||||
- Roll over month to month.
|
||||
|
||||
In order to purchase additional minutes, you should follow these steps:
|
||||
|
||||
1. Go to **Group > Settings > Pipelines quota**. Once you are on that page, click on **Buy additional minutes**.
|
||||
|
||||
![Buy additional minutes](img/buy_btn.png)
|
||||
|
||||
1. Locate the subscription card that is linked to your group on GitLab.com,
|
||||
click on **Buy more CI minutes**, and complete the details about the transaction.
|
||||
|
||||
![Buy additional minutes](img/buy_minutes_card.png)
|
||||
|
||||
1. Once we have processed your payment, the extra CI minutes
|
||||
will be synced to your Group and you can visualize it from the
|
||||
**Group > Settings > Pipelines quota** page:
|
||||
|
||||
![Additional minutes](img/additional_minutes.png)
|
||||
|
||||
Be aware that:
|
||||
|
||||
1. If you have purchased extra CI minutes before the purchase of a paid plan,
|
||||
we will calculate a pro-rated charge for your paid plan. That means you may
|
||||
be charged for less than one year since your subscription was previously
|
||||
created with the extra CI minutes.
|
||||
1. Once the extra CI minutes has been assigned to a Group they cannot be transferred
|
||||
to a different Group.
|
||||
1. If you have some minutes used over your default quota, these minutes will
|
||||
be deducted from your Additional Minutes quota immediately after your purchase of additional
|
||||
minutes.
|
||||
|
||||
## What happens when my CI minutes quota run out
|
||||
|
||||
When the CI minutes quota run out, an email is sent automatically to notifies the owner(s) of the group/namespace which
|
||||
includes a link to [purchase more minutes](https://customers.gitlab.com/plans).
|
||||
|
||||
If you are not the owner of the group, you will need to contact them to let them know they need to
|
||||
[purchase more minutes](https://customers.gitlab.com/plans).
|
||||
|
||||
## Archive jobs **(CORE ONLY)**
|
||||
|
||||
Archiving jobs is useful for reducing the CI/CD footprint on the system by
|
||||
|
|
|
@ -81,13 +81,12 @@ IP based firewall can be configured by looking up all
|
|||
|
||||
## Shared Runners
|
||||
|
||||
Shared Runners on GitLab.com run in [autoscale mode] and powered by
|
||||
Google Cloud Platform. Autoscaling means reduced
|
||||
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
|
||||
minutes per month per group for private projects. Read about all
|
||||
[GitLab.com plans](https://about.gitlab.com/pricing/).
|
||||
Shared Runners on GitLab.com run in [autoscale mode] and powered by Google Cloud Platform.
|
||||
Autoscaling means reduced 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 minutes per month per group for private projects. More minutes
|
||||
[can be purchased](../../subscriptions/index.md#extra-shared-runners-pipeline-minutes), if
|
||||
needed. Read about all [GitLab.com plans](https://about.gitlab.com/pricing/).
|
||||
|
||||
All your CI/CD jobs run on [n1-standard-1 instances](https://cloud.google.com/compute/docs/machine-types) with 3.75GB of RAM, CoreOS and the latest Docker Engine
|
||||
installed. Instances provide 1 vCPU and 25GB of HDD disk space. The default
|
||||
|
|
Loading…
Reference in New Issue