diff --git a/jh/doc/ci/pipelines/cicd_minutes.md b/jh/doc/ci/pipelines/cicd_minutes.md index 3b2e0d0e9c54b0db5fe9475105869fc670f18b24..544b08bcc46a888b40c154ac9a54579b60055579 100644 --- a/jh/doc/ci/pipelines/cicd_minutes.md +++ b/jh/doc/ci/pipelines/cicd_minutes.md @@ -140,7 +140,7 @@ NOTE: 您å¯ä»¥ä¸ºæ‚¨çš„群组è´ä¹°é¢å¤–çš„ CI/CD 分钟数。 æ‚¨æ— æ³•å°†è´ä¹°çš„ CI/CD 分钟数从一个群组转移到å¦ä¸€ä¸ªç¾¤ç»„ï¼Œå› æ¤è¯·åŠ¡å¿…选择æ£ç¡®çš„群组。 -1. 在顶部æ 上,选择 **èœå• > 群组** 并找到您的组。 +1. 在顶部æ 上,选择 **èœå• > 群组** 并找到您的群组。 1. 在左侧边æ ä¸ï¼Œé€‰æ‹© **设置 > 使用é‡é…é¢**。 1. 选择 **è´ä¹°æ›´å¤šåˆ†é’Ÿæ•°**。 1. 填写交易详情。 @@ -184,27 +184,56 @@ Job duration * Cost factor 一æ¡æµæ°´çº¿ä½¿ç”¨çš„ CI/CD 分钟数是æµæ°´çº¿ä¸è¿è¡Œçš„所有作业使用的总 CI/CD 分钟数。作业å¯ä»¥åŒæ—¶è¿è¡Œï¼Œå› æ¤æ€» CI/CD 分钟使用é‡å¯èƒ½é«˜äºŽæµæ°´çº¿çš„端到端æŒç»æ—¶é—´ã€‚ -<!-- -### Cost factor +### 消耗å‚æ•° -The cost factor for a job running on a shared runner is: +在 JiHuLab 的共享è¿è¡Œå™¨ä¸Šè¿è¡Œä½œä¸šçš„消耗å‚数为: -- `0.008` for public projects on GitLab SaaS, if [created 2021-07-17 or later](https://gitlab.com/gitlab-org/gitlab/-/issues/332708). - (For every 125 minutes of job time, you accrue 1 CD/CD minute.) -- `0.008` for projects members of GitLab [Open Source program](../../subscriptions/index.md#gitlab-for-open-source). - (For every 125 minutes of job time, you accrue 1 CD/CD minute.) -- `0` for public projects on GitLab self-managed instances, and for GitLab SaaS public projects created before 2021-07-17. -- `1` for internal and private projects. +- `1`:内部和ç§äººé¡¹ç›®ã€‚ +- `0.5`:[æžç‹GitLab å¼€æºé¡¹ç›®](../../subscriptions/index.md#gitlab-for-open-source)ä¸çš„公共项目。 +- `0.008`:[æžç‹GitLab å¼€æºé¡¹ç›®](../../subscriptions/index.md#gitlab-for-open-source)ä¸å…¬å…±é¡¹ç›®çš„å…¬å…±æ´¾ç”Ÿã€‚å¯¹äºŽæ¯ 125 分钟的作业执行时间, + 您会使用 1 个 CI/CD 分钟数。 +- `1`:2022 å¹´ 10 月 1 日之åŽçš„其他公共项目。 + å¯¹äºŽæ¯ 1 分钟的作业执行时间,您会使用 1 个 CI/CD 分钟数。 +- [å…费版æžç‹GitLab 项目](#cost-factor-for-community-contributions-to-gitlab-projects)有å¦å¤–的计算方å¼ã€‚ -### Additional costs on GitLab SaaS +ç§æœ‰åŒ–部署的消耗å‚数为: -GitLab SaaS shared runners have different cost factors, depending on the runner type (Linux, Windows, macOS) and the virtual machine configuration. +- `0`:公共项目,ä¸æ¶ˆè€— CI/CD 分钟数。 +- `1`:内部和ç§äººé¡¹ç›®ã€‚ + +<a id="cost-factor-for-community-contributions-to-gitlab-projects"></a> + +#### å…费版æžç‹GitLab 项目的消耗å‚æ•° + +使用å…费版æžç‹GitLab 的贡献者在为æžç‹GitLab 维护的开æºé¡¹ç›®åšå‡ºè´¡çŒ®æ—¶å¯ä»¥ä½¿ç”¨å…±äº« Runner 上的 30 万分钟数。 +è¿™ 30 万分钟数适用于所有 SaaS 层,消耗å‚数计算方å¼å¦‚下: + +- `Monthly minute quota / 300,000 job duration minutes = Cost factor` + +例如,专业版ä¸æ¯ä¸ªæœˆæ‹¥æœ‰ 10,000 çš„ CI/CD 分钟数: + +- 10,000 / 300,000 = 0.03333333333 消耗å‚æ•° + +对于é™ä½Žçš„消耗å‚数: + +- åˆå¹¶è¯·æ±‚æºé¡¹ç›®å¿…须是æžç‹GitLab 所维护项目的派生。 + <!--例如 [`gitlab-com/www-gitlab-com`](https://gitlab.com/gitlab-com/www-gitlab-com) 或 + [`gitlab-org/gitlab`](https://gitlab.com/gitlab-org/gitlab) ç‰ã€‚--> +- åˆå¹¶è¯·æ±‚ç›®æ ‡é¡¹ç›®å¿…é¡»æ˜¯æ´¾ç”Ÿçš„çˆ¶é¡¹ç›®ã€‚ +- æµæ°´çº¿å¿…须是åˆå¹¶è¯·æ±‚ã€åˆå¹¶ç»“果或åˆå¹¶é˜Ÿåˆ—æµæ°´çº¿ã€‚ + +æžç‹GitLab 管ç†å‘˜å¯ä»¥ä½¿ç”¨å为 `ci_minimal_cost_factor_for_gitlab_namespaces` çš„[æ ‡å¿—](../../administration/feature_flags.md)将命åç©ºé—´æ·»åŠ åˆ°é™ä½Žçš„消耗å‚æ•°ä¸ã€‚ + +### JiHuLab SaaS 上的é¢å¤–消耗 + +JiHuLab SaaS Runner æ ¹æ®ä¸åŒçš„ Runner 类型(Linuxã€Windows 或 macOS)和虚拟机é…置,拥有ä¸åŒçš„消耗å‚数。 + +| JiHuLab SaaS Runner 类型 | 机器类型 | CI/CD 分钟数消耗å‚æ•° | +|:---------------------------|:-----|:---------------------------------| +| Linux OS + Docker 执行器 | å° | 1 | +| Linux OS + Docker 执行器 | ä¸ | 2 | +| Linux OS + Docker 执行器 | 大 | 3 | -| SaaS runner 类型 | 虚拟机é…ç½® | CI/CD åˆ†é’Ÿæ¶ˆè€—å› æ•° | -| :--------- | :------------------- | :--------- | -| Linux OS + Docker executor| 1 vCPU, 3.75 GB RAM |1| -| macOS + shell executor | 4 vCPU, 10 GB RAM| 6 | ---> ### æ¯æœˆé‡ç½® CI/CD 分钟数 diff --git a/jh/doc/subscriptions/index.md b/jh/doc/subscriptions/index.md index 38c9489bd40cb199d30141fdc982e674757cf998..855857d68e4b9b010b7455f3cc59645ff32e28ad 100644 --- a/jh/doc/subscriptions/index.md +++ b/jh/doc/subscriptions/index.md @@ -160,13 +160,14 @@ non-commercial academic research. Find more information how to apply and renew at [GitLab for Education](https://about.gitlab.com/solutions/education/). +--> -## GitLab for Open Source subscriptions +<a id="gitlab-for-open-source"></a> -All [GitLab for Open Source](https://about.gitlab.com/solutions/open-source/) -requests, including subscription renewals, must be made by using the application process. -If you have any questions, send an email to `opensource@gitlab.com` for assistance. ---> +## å¼€æºè®¢é˜…çš„æžç‹GitLab + +所有的[æžç‹GitLab å¼€æº](https://about.gitlab.cn/solutions/open-source/)请求,包括ç»è®¢ï¼Œéƒ½å¿…须使用应用程åºè¿›ç¨‹è¿›è¡Œæ出。 +如有任何疑问,请å‘邮件至 opensource@jihulab.com。 ## è”系技术支æŒ