diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2022-09-07 09:54:43 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2022-09-07 09:54:43 +0300 |
| commit | c4736a4440b339c194f25b0c68c41ff4db926b62 (patch) | |
| tree | 04b31c270790c0f348ac7e9dd5eac0a7ad3d870e | |
| parent | 4f46131ecc97a035e5de69e3d4c48f4bfc290d36 (diff) | |
| parent | fe0af4771d23253b709366722be08950bb4bbd69 (diff) | |
Merge branch 'kpaizee-update-pipeline-docs' into 'main'
Change deployment pipeline window
See merge request gitlab-org/gitlab-docs!3071
| -rw-r--r-- | doc/architecture.md | 4 | ||||
| -rw-r--r-- | doc/maintenance.md | 2 | ||||
| -rw-r--r-- | doc/releases.md | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/architecture.md b/doc/architecture.md index 4098a06c..c82063dc 100644 --- a/doc/architecture.md +++ b/doc/architecture.md @@ -134,14 +134,14 @@ a different name first and test it to ensure you do not break the pipelines. ### Deploy the docs site -Every four hours a scheduled pipeline builds and deploys the docs site. The pipeline +Every hour a scheduled pipeline builds and deploys the docs site. The pipeline fetches the current docs from the main project's main branch, builds it with Nanoc and deploys it to <https://docs.gitlab.com>. To build and deploy the site immediately (must have the Maintainer role): 1. In [`gitlab-docs`](https://gitlab.com/gitlab-org/gitlab-docs), go to **{rocket}** **CI/CD > Schedules**. -1. For the `Build docs.gitlab.com every 4 hours` scheduled pipeline, select the **play** (**{play}**) button. +1. For the `Build docs.gitlab.com every hour` scheduled pipeline, select the **play** (**{play}**) button. Read more about [documentation deployments](https://docs.gitlab.com/ee/development/documentation/site_architecture/deployment_process.html). diff --git a/doc/maintenance.md b/doc/maintenance.md index 860f7137..7d9423ba 100644 --- a/doc/maintenance.md +++ b/doc/maintenance.md @@ -16,7 +16,7 @@ host this website. The site is built and deployed automatically in GitLab CI/CD jobs. See [`.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab-docs/-/blob/main/.gitlab-ci.yml) for the current configuration. The project has [scheduled pipelines](https://docs.gitlab.com/ee/user/project/pipelines/schedules.html) -that build and deploy the site once every four hours. +that build and deploy the site every hour. ## Survey banner diff --git a/doc/releases.md b/doc/releases.md index f35f8855..1b024a73 100644 --- a/doc/releases.md +++ b/doc/releases.md @@ -189,7 +189,7 @@ The merge requests for the dropdowns should now all be merged into their respect 1. Go to the [scheduled pipelines page](https://gitlab.com/gitlab-org/gitlab-docs/-/pipeline_schedules) and run the `Build docker images weekly` pipeline. 1. In the scheduled pipeline you just started, manually run the **image:docs-latest** job that builds the `:latest` Docker image. -1. When the pipeline is complete, run the `Build docs.gitlab.com every 4 hours` scheduled pipeline to deploy all new versions to the public documentation site. +1. When the pipeline is complete, run the `Build docs.gitlab.com every hour` scheduled pipeline to deploy all new versions to the public documentation site. You don't need to run any jobs manually for this second pipeline. ## Post-deployment checklist |