Commit 1037d6f0 authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'update-docs-version-process' into 'master'

Update docs versioning process

See merge request gitlab-org/gitlab!33066
parents 4026a84e 7455b4cb
...@@ -62,30 +62,15 @@ The single docs version must be created before the release merge request, but ...@@ -62,30 +62,15 @@ The single docs version must be created before the release merge request, but
this needs to happen when the stable branches for all products have been created. this needs to happen when the stable branches for all products have been created.
1. Make sure you're in the root path of the `gitlab-docs` repository. 1. Make sure you're in the root path of the `gitlab-docs` repository.
1. Make sure your `master` is updated:
```shell
git pull origin master
```
1. Run the Rake task to create the single version: 1. Run the Rake task to create the single version:
```shell ```shell
./bin/rake "release:single[12.0]" ./bin/rake "release:single[12.0]"
``` ```
A new `Dockerfile.12.0` should have been created and committed to a new branch. A new `Dockerfile.12.0` should have been created and `.gitlab-ci.yml` should
have the branches variables updated into a new branch. They will be automatically
1. Edit `.gitlab-ci.yml` and replace the `BRANCH_` variables with their respective committed.
upstream stable branch. For example, 12.6 would look like:
```yaml
variables:
BRANCH_EE: '12-6-stable-ee'
BRANCH_OMNIBUS: '12-6-stable'
BRANCH_RUNNER: '12-6-stable'
BRANCH_CHARTS: '2-6-stable'
```
1. Push the newly created branch, but **don't create a merge request**. 1. Push the newly created branch, but **don't create a merge request**.
Once you push, the `image:docker-singe` job will create a new Docker image Once you push, the `image:docker-singe` job will create a new Docker image
...@@ -106,6 +91,9 @@ Visit `http://localhost:4000/12.0/` to see if everything works correctly. ...@@ -106,6 +91,9 @@ Visit `http://localhost:4000/12.0/` to see if everything works correctly.
### 3. Create the release merge request ### 3. Create the release merge request
NOTE: **Note:**
To be [automated](https://gitlab.com/gitlab-org/gitlab-docs/-/issues/750).
Now it's time to create the monthly release merge request that adds the new Now it's time to create the monthly release merge request that adds the new
version and rotates the old one: version and rotates the old one:
...@@ -161,7 +149,7 @@ versions: ...@@ -161,7 +149,7 @@ versions:
1. Run the Rake task that will create all the respective merge requests needed to 1. Run the Rake task that will create all the respective merge requests needed to
update the dropdowns and will be set to automatically be merged when their update the dropdowns and will be set to automatically be merged when their
pipelines succeed. The `release-X-Y` branch needs to be present locally, pipelines succeed. The `release-X-Y` branch needs to be present locally,
otherwise the Rake task will fail: and you need to have switched to it, otherwise the Rake task will fail:
```shell ```shell
./bin/rake release:dropdowns ./bin/rake release:dropdowns
......
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