Skip to content

Commit 10cc625

Browse files
committed
docs: correct and expand release-all process documentation
Add prerequisites section, document release order and dependencies, fix step 3 structure, add error recovery guidance, and clarify annotated tag and CI/CD requirements. Signed-off-by: Anthony Floeder <anthony.floeder@hpe.com>
1 parent e888fbb commit 10cc625

1 file changed

Lines changed: 96 additions & 27 deletions

File tree

docs/repo-guides/release-nnf-sw/release-all.md

Lines changed: 96 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,88 @@ other components.
1717
- [DataWorkflowServices/dws](https://github.com/DataWorkflowServices/dws)
1818
- [HewlettPackard/lustre-csi-driver](https://github.com/HewlettPackard/lustre-csi-driver)
1919
- [NearNodeFlash/lustre-fs-operator](https://github.com/NearNodeFlash/lustre-fs-operator)
20-
- [NearNodeFlash/nnf-mfu](https://github.com/NearNodeFlash/nnf-mfu)
21-
- [NearNodeFlash/nnf-ec](https://github.com/NearNodeFlash/nnf-ec)
20+
- [NearNodeFlash/nnf-mfu](https://github.com/NearNodeFlash/nnf-mfu) *(standalone repo, not a submodule)*
21+
- [NearNodeFlash/nnf-ec](https://github.com/NearNodeFlash/nnf-ec) *(standalone repo, not a submodule)*
2222
- [NearNodeFlash/nnf-sos](https://github.com/NearNodeFlash/nnf-sos)
2323
- [NearNodeFlash/nnf-dm](https://github.com/NearNodeFlash/nnf-dm)
2424
- [NearNodeFlash/nnf-integration-test](https://github.com/NearNodeFlash/nnf-integration-test)
2525

2626
- [NearNodeFlash/NearNodeFlash.github.io](https://github.com/NearNodeFlash/NearNodeFlash.github.io)
2727

28+
The release order matters because of dependency relationships between repos. The `release-all.sh`
29+
tool enforces the following order:
30+
31+
1. `dws`
32+
2. `lustre-csi-driver`
33+
3. `lustre-fs-operator`
34+
4. `nnf-mfu`
35+
5. `nnf-ec`
36+
6. `nnf-sos` (depends on dws, nnf-mfu, nnf-ec)
37+
7. `nnf-dm` (depends on dws, nnf-sos, nnf-mfu)
38+
8. `nnf-integration-test` (depends on dws, nnf-sos, nnf-dm, lustre-fs-operator)
39+
9. `nnf-deploy` (packages all submodules)
40+
10. `NearNodeFlash.github.io` (documentation, version matches nnf-deploy)
41+
2842
## Overview of release-all tool
2943

3044
`release-all.sh` automates most of the steps of releasing NNF software and adds additional checks for common issues.
3145

46+
## Prerequisites
47+
48+
The following tools must be installed and available in your PATH:
49+
50+
| Tool | Purpose | Notes |
51+
|------|---------|-------|
52+
| `gh` | GitHub CLI for PRs, releases | Requires `GH_TOKEN` env var (see below) |
53+
| `yq` | YAML processing | Must be the [Go version](https://github.com/mikefarah/yq), not the Python version |
54+
| `jq` | JSON processing | Used by `final-release-notes.sh` |
55+
| `git` | Version control | SSH access to GitHub required |
56+
| `make` | Build automation | Runs `make manifests`, `make generate`, etc. |
57+
| `perl` | Version string manipulation | Used for semver bump calculations |
58+
| `sed` | Text processing | |
59+
| `tput` | Terminal formatting | |
60+
61+
**Environment variables:**
62+
63+
- `GH_TOKEN` — A GitHub classic personal access token with `repo` scope. Required by `gh` and by the `release-push`, `create-pr`, `merge-pr`, and `tag-release` phases.
64+
65+
**SSH access:**
66+
67+
- Verify with `ssh -T git@github.com`. The release tool clones all repos via SSH.
68+
3269
## Assumptions
3370

3471
- `master` or `main` branch for each repository contains **tested** software and documentation ready to be released.
35-
- You've installed the GitHub CLI tool, `gh`.
36-
- This tool requires a GH_TOKEN environment variable containing a `repo` scope classic token.
3772

3873
## Steps
3974

4075
### Run the steps in this order
4176

42-
> **Note:** You almost always want to use the -R option to focus the `phase` activity to a specific repo.
77+
> **Note:** You almost always want to use the `-R` option to focus the `phase` activity to a specific repo.
78+
>
79+
> Use `-B major|minor|patch` (default: `patch`) to control which part of the version number is bumped.
4380
44-
0. **List Repos:** Get the ordered list of repo names to use with -R option in subsequent steps. This is referred to as `repo-list`
81+
0. **List Repos:** Get the ordered list of repo names to use with `-R` option in subsequent steps. This is referred to as `repo-list`
4582
> **Pro tip:** Keep this list in a separate window for easy viewing
83+
84+
```bash
4685
./release-all.sh -L
86+
```
87+
88+
The output will show the repos in dependency order:
89+
90+
```
91+
dws
92+
lustre_csi_driver
93+
lustre_fs_operator
94+
nnf_mfu
95+
nnf_ec
96+
nnf_sos
97+
nnf_dm
98+
nnf_integration_test
99+
nnf_deploy
100+
nnf_doc
101+
```
47102

48103
1. **Check Vendoring:** For each repo's master/main branch; determine whether any of them need to be re-vendored.
49104
> **Note:** Ensure each repo is error-free before proceeding to the next repo in `repo-list`
@@ -61,21 +116,24 @@ other components.
61116
```
62117

63118
3. **Generate Release:** For each repo in `repo-list`, proceed through the following steps in sequence before moving on to the next repo.
64-
> **Note:** The next steps use the gh(1) GitHub CLI tool and require a GH_TOKEN environment variable containing a 'repo' scope classic token.
65-
1. If the **Create Trial Release Branch** had no errors:
119+
> **Note:** The next steps use the `gh` GitHub CLI tool and require a `GH_TOKEN` environment variable containing a `repo` scope classic token.
120+
121+
**Step 3a — Push the release branch.** Choose one of the following based on whether step 2 had merge conflicts:
122+
123+
- If the **Create Trial Release Branch** had **no errors**:
66124

67125
```bash
68126
./release-all.sh -P release-push -R <repo>
69127
```
70128

71-
2. If **Create Trial Release Branch** was unable to auto merge, manually fix and merge the release branch and re-run this phase on that existing branch:
129+
- If **Create Trial Release Branch** was unable to auto merge, manually fix and merge the release branch, then re-run this phase on the existing branch:
72130

73131
```bash
74-
cd workingspace/repo
132+
cd workingspace/<repo>
75133
# Manually merge the changes from master/main to the release branch
76134
go mod tidy
77135
go mod vendor
78-
git status # confirm all issues have been address
136+
git status # confirm all issues have been addressed
79137
git add <all affected files>
80138
git commit -s # take the default commit message, don't bother editing it.
81139
```
@@ -86,44 +144,55 @@ other components.
86144
USE_EXISTING_WORKAREA=1 ./release-all.sh -P release-push -R <repo>
87145
```
88146

89-
3. Create PR for the pushed release branch:
147+
**Step 3b** Create PR for the pushed release branch:
90148

91-
```bash
92-
./release-all.sh -P create-pr -R <repo>
93-
```
149+
```bash
150+
./release-all.sh -P create-pr -R <repo>
151+
```
94152

95-
4. Merge PR for the pushed release branch:
96-
**Note: Do NOT manually merge the PR, let `release-all.sh` merge it.**
153+
**Step 3c** — Merge PR for the pushed release branch:
97154

98-
```bash
99-
./release-all.sh -P merge-pr -R <repo>
100-
```
155+
> **Warning:** Do NOT manually merge the PR. Let `release-all.sh` merge it. If you accidentally merge manually, the `tag-release` phase may not find the expected merge commit message — use `-x force-tag=vX.Y.Z` to recover (see step 3d).
101156

102-
5. Tag the release:
157+
```bash
158+
./release-all.sh -P merge-pr -R <repo>
159+
```
103160

104-
```bash
105-
./release-all.sh -P tag-release -R <repo>
106-
```
161+
**Step 3d** — Tag the release:
162+
163+
> **Important:** This creates an **annotated** git tag. The CI/CD workflow (`handle_release_tag.yaml`) verifies that the tag is annotated and will reject lightweight tags. After tagging, the CI/CD workflow automatically creates the GitHub release with auto-generated release notes and attaches build artifacts (e.g., `manifests.tar` for `nnf-deploy`).
164+
165+
```bash
166+
./release-all.sh -P tag-release -R <repo>
167+
```
168+
169+
If tagging fails because the most recent commit doesn't contain the expected merge message (e.g., due to a manual merge), use the force-tag override:
170+
171+
```bash
172+
./release-all.sh -P tag-release -R <repo> -x force-tag=vX.Y.Z
173+
```
107174
108175
## Finalize the release notes
109176
110177
Finalize the release by updating the `nnf-deploy` release notes to include the release notes from all submodules that were modified by this release. This also updates the release notes for any submodule that has CRDs, to include information about each version of the CRD offered by that submodule. Do this after the release steps have been completed for all repositories, including the NearNodeFlash.github.io repository.
111178
179+
> **Note:** `final-release-notes.sh` requires `yq`, `gh`, `jq`, and `perl` to be installed, and `GH_TOKEN` to be set.
180+
112181
1. Generate complete release notes for the specified `nnf-deploy` release for review:
113182
114183
```bash
115184
./final-release-notes.sh -r $NNF_RELEASE
116185
```
117186
118-
2. Generate and commit the release notes to the specified `nnf-deploy` release:
187+
2. Review the generated notes, then commit them:
119188
120189
```bash
121190
./final-release-notes.sh -r $NNF_RELEASE -C
122191
```
123192
124-
## Compare release manifests
193+
## Verify the release
125194
126-
Compare the new NNF release manifest to a previous NNF release manifest. This can be useful for a variety of purposes. For example, this is a quick way to check for any problems in the release or to see which submodules were updated in the release.
195+
After all repos are released and release notes are finalized, compare the new NNF release manifest to the previous release manifest. This is a recommended verification step to confirm the release contains the expected changes and catch any problems.
127196
128197
```console
129198
./compare-releases.sh v0.1.6 v0.1.7

0 commit comments

Comments
 (0)