Skip to content

Commit 0e9e259

Browse files
[chore] Update release doc to remove step 1 of releasing contrib (#12632)
#### Description Once [contrib#38534](open-telemetry/opentelemetry-collector-contrib#38534) is merged, the manual changes that were necessary in step 1 of releasing contrib should now be included in step 2 (the Prepare Release CI workflow). This PR updates the release doc to remove step 1. #### Link to tracking issue Updates #12294
1 parent e4c4d2f commit 0e9e259

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

Diff for: docs/release.md

+5-17
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,11 @@ Before the release, make sure there are no open release blockers in [core](https
6767

6868
## Releasing opentelemetry-collector-contrib
6969

70-
1. Open a PR to Contrib to use the newly released Core version by doing the following:
71-
- Manually update `dist.version` and core collector module versions in `cmd/otelcontribcol/builder-config.yaml`
72-
- Manually update `dist.version` and core collector module versions in `cmd/oteltestbedcol/builder-config.yaml`
73-
- Run `make genotelcontribcol genoteltestbedcol`
74-
- Commit the changes
75-
- Run `make update-otel OTEL_VERSION=v0.85.0 OTEL_STABLE_VERSION=v1.1.0`
76-
- If there is no new stable version released in core collector, use the current stable module version in contrib as `OTEL_STABLE_VERSION`.
77-
- If you were unable to run `make update-otel` before releasing core, fix any errors from breaking changes.
78-
- Commit the changes
79-
- Open the PR
80-
- 🛑 **Do not move forward until this PR is merged.** 🛑
81-
82-
2. Manually run the action [Automation - Prepare Release](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/workflows/prepare-release.yml). When prompted, enter the version numbers determined in Step 1, but do not include a leading `v`. This action will create a pull request to update the changelog and version numbers in the repo. **While this PR is open all merging in Contrib should be halted**.
70+
1. Manually run the action [Automation - Prepare Release](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/workflows/prepare-release.yml). When prompted, enter the version numbers of the current and new beta versions, but do not include a leading `v`. This action will create a pull request to update the changelog and version numbers in the repo. **While this PR is open all merging in Contrib should be halted**.
8371
- If the PR needs updated in any way you can make the changes in a fork and PR those changes into the `prepare-release-prs/x` branch. You do not need to wait for the CI to pass in this prep-to-prep PR.
8472
- 🛑 **Do not move forward until this PR is merged.** 🛑
8573

86-
3. Check out main and ensure it has the "Prepare release" commit in your local
74+
2. Check out main and ensure it has the "Prepare release" commit in your local
8775
copy by pulling in the latest from
8876
`open-telemetry/opentelemetry-collector-contrib`. Use this commit to create a
8977
branch named `release/<release-series>` (e.g. `release/v0.85.x`). Push the
@@ -93,15 +81,15 @@ Before the release, make sure there are no open release blockers in [core](https
9381
- `git switch -c release/<release series>` # append the commit hash of the PR in the last step if it is not the head of mainline
9482
- `git push -u upstream release/<release series>`
9583

96-
4. Make sure you are on `release/<release-series>`. Tag all the module groups with the new release version by running:
84+
3. Make sure you are on `release/<release-series>`. Tag all the module groups with the new release version by running:
9785

9886
⚠️ If you set your remote using `https` you need to include `REMOTE=https://github.com/open-telemetry/opentelemetry-collector-contrib.git` in each command. ⚠️
9987

10088
- `make push-tags MODSET=contrib-base`
10189

102-
5. Wait for the new tag build to pass successfully.
90+
4. Wait for the new tag build to pass successfully.
10391

104-
6. A new `v0.85.0` release should be automatically created on Github by now. Edit it and use the contents from the CHANGELOG.md as the release's description. At the top of the release notes add a section listing the unmaintained components ([example](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.114.0)).
92+
5. A new `v0.85.0` release should be automatically created on Github by now. Edit it and use the contents from the CHANGELOG.md as the release's description. At the top of the release notes add a section listing the unmaintained components ([example](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.114.0)).
10593

10694
## Producing the artifacts
10795

0 commit comments

Comments
 (0)