Commit 72002e21 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'patch-177' into 'master'

Move note about auto stop limitations out of example

See merge request gitlab-org/gitlab!35934
parents b5efc992 779c28b2
...@@ -739,6 +739,12 @@ To enable this feature, you need to specify the [`environment:auto_stop_in`](../ ...@@ -739,6 +739,12 @@ To enable this feature, you need to specify the [`environment:auto_stop_in`](../
You can specify a human-friendly date as the value, such as `1 hour and 30 minutes` or `1 day`. You can specify a human-friendly date as the value, such as `1 hour and 30 minutes` or `1 day`.
`auto_stop_in` uses the same format of [`artifacts:expire_in` docs](../yaml/README.md#artifactsexpire_in). `auto_stop_in` uses the same format of [`artifacts:expire_in` docs](../yaml/README.md#artifactsexpire_in).
NOTE: **Note:**
Due to the resource limitation, a background worker for stopping environments only
runs once every hour. This means environments will not be stopped at the exact
timestamp as the specified period, but will be stopped when the hourly cron worker
detects expired environments.
##### Auto-stop example ##### Auto-stop example
In the following example, there is a basic review app setup that creates a new environment In the following example, there is a basic review app setup that creates a new environment
...@@ -778,12 +784,6 @@ and the environment will be active until it's stopped manually. ...@@ -778,12 +784,6 @@ and the environment will be active until it's stopped manually.
![Environment auto stop](../img/environment_auto_stop_v12_8.png) ![Environment auto stop](../img/environment_auto_stop_v12_8.png)
NOTE: **NOTE**
Due to the resource limitation, a background worker for stopping environments only
runs once every hour. This means environments will not be stopped at the exact
timestamp as the specified period, but will be stopped when the hourly cron worker
detects expired environments.
#### Delete a stopped environment #### Delete a stopped environment
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/20620) in GitLab 12.10. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/20620) in GitLab 12.10.
......
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