Skip to content

Commit e880b0a

Browse files
authored
Merge pull request #320 from NearNodeFlash:add-storedversions-maint-to-release
Add nnf-storedversions-maint to release process
2 parents 511e707 + bbf19a2 commit e880b0a

5 files changed

Lines changed: 31 additions & 14 deletions

File tree

.github/agents/release.agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
description: "Use when performing an NNF software release, creating release branches, tagging releases, managing release PRs, running release-all.sh, comparing releases, or finalizing release notes. Covers releases across the 10 NNF repositories."
2+
description: "Use when performing an NNF software release, creating release branches, tagging releases, managing release PRs, running release-all.sh, comparing releases, or finalizing release notes. Covers releases across all NNF repositories."
33
tools: [execute, read, edit, search, todo, web]
44
argument-hint: "Specify the release type (patch, minor, or major) — defaults to patch"
55
---

tools/release-all/RELEASE-PLAN.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ This document is the authoritative, self-contained guide for executing an NNF so
1313
| `lustre_fs_operator` | `NearNodeFlash/lustre-fs-operator` | NearNodeFlash | `master` | |
1414
| `nnf_mfu` | `NearNodeFlash/nnf-mfu` | NearNodeFlash | `master` | Standalone, not a submodule |
1515
| `nnf_ec` | `NearNodeFlash/nnf-ec` | NearNodeFlash | `master` | Standalone, not a submodule |
16+
| `nnf_storedversions_maint` | `NearNodeFlash/nnf-storedversions-maint` | NearNodeFlash | **`main`** (not master) | Standalone, not a submodule |
1617
| `nnf_sos` | `NearNodeFlash/nnf-sos` | NearNodeFlash | `master` | Requires `-M` flag |
1718
| `nnf_dm` | `NearNodeFlash/nnf-dm` | NearNodeFlash | `master` | Vendors nnf-sos |
1819
| `nnf_integration_test` | `NearNodeFlash/nnf-integration-test` | NearNodeFlash | `master` | Vendors nnf-sos |
@@ -24,7 +25,7 @@ This document is the authoritative, self-contained guide for executing an NNF so
2425
**Dependency chain (release order):**
2526

2627
```text
27-
dws → lustre_csi_driver → lustre_fs_operator → nnf_mfu → nnf_ec → nnf_sos → nnf_dm → nnf_integration_test → nnf_deploy → nnf_doc
28+
dws → lustre_csi_driver → lustre_fs_operator → nnf_mfu → nnf_ec → nnf_storedversions_maint → nnf_sos → nnf_dm → nnf_integration_test → nnf_deploy → nnf_doc
2829
```
2930

3031
**Vendoring dependencies (peer modules in `go.mod`):**
@@ -33,6 +34,7 @@ dws → lustre_csi_driver → lustre_fs_operator → nnf_mfu → nnf_ec → nnf_
3334
- `nnf_sos` vendors `dws`, `lustre-fs-operator`, `nnf-ec`
3435
- `nnf_dm` vendors `dws`, `lustre-fs-operator`, `nnf-ec` (indirect), `nnf-sos`
3536
- `nnf_integration_test` vendors `dws`, `lustre-fs-operator`, `nnf-ec` (indirect), `nnf-sos`
37+
- `nnf_storedversions_maint` has **no** NNF peer vendoring dependencies
3638

3739
If an upstream repo changes, **all downstream repos that vendor it** may need revendoring before the release (see Step 2a). The vendoring check in Step 2 catches these automatically.
3840

@@ -108,7 +110,7 @@ List repos:
108110
./release-all.sh -L
109111
```
110112

111-
Save the ordered list: `dws`, `lustre_csi_driver`, `lustre_fs_operator`, `nnf_mfu`, `nnf_ec`, `nnf_sos`, `nnf_dm`, `nnf_integration_test`, `nnf_deploy`, `nnf_doc`.
113+
Save the ordered list: `dws`, `lustre_csi_driver`, `lustre_fs_operator`, `nnf_mfu`, `nnf_ec`, `nnf_storedversions_maint`, `nnf_sos`, `nnf_dm`, `nnf_integration_test`, `nnf_deploy`, `nnf_doc`.
112114

113115
#### Step 2 — Check vendoring *(sequential, per repo)*
114116

@@ -159,7 +161,7 @@ done
159161

160162
Review output for merge conflicts before continuing.
161163

162-
> **Note:** `nnf_mfu` and `nnf_ec` are standalone repos that often have no new commits between releases. If either reports "No new changes to release", this is normal — **skip that repo in all subsequent phases** (Steps 4a–4d and the `nnf_doc` sequence). Do not attempt to push, PR, merge, or tag a repo that had no changes.
164+
> **Note:** `nnf_mfu`, `nnf_ec`, and `nnf_storedversions_maint` are standalone repos that often have no new commits between releases. If any reports "No new changes to release", this is normal — **skip that repo in all subsequent phases** (Steps 4a–4d and the `nnf_doc` sequence). Do not attempt to push, PR, merge, or tag a repo that had no changes.
163165
164166
#### `nnf_doc` deferral
165167

tools/release-all/final-release-notes.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ PROG=$(basename "$0")
2323

2424
NNF_DOC_URL='git@github.com:NearNodeFlash/NearNodeFlash.github.io.git'
2525
NNF_DEPLOY_URL='git@github.com:NearNodeFlash/nnf-deploy.git'
26+
NNF_STOREDVERSIONS_MAINT_URL='git@github.com:NearNodeFlash/nnf-storedversions-maint.git'
2627

2728
BOLD=$(tput bold)
2829
NORMAL=$(tput sgr0)
@@ -382,6 +383,11 @@ dep_url="$NNF_DEPLOY_URL"
382383
dep_name=$(get_repo_dir_name "$dep_url")
383384
check_release_vX "$dep_repo_short_name" "$dep_name" "$dep_url" "releases/v0"
384385

386+
svm_repo_short_name="nnf_storedversions_maint"
387+
svm_url="$NNF_STOREDVERSIONS_MAINT_URL"
388+
svm_name=$(get_repo_dir_name "$svm_url")
389+
check_release_vX "$svm_repo_short_name" "$svm_name" "$svm_url" "releases/v0"
390+
385391
doc_repo_short_name="nnf_doc"
386392
doc_url="$NNF_DOC_URL"
387393
doc_name=$(get_repo_dir_name "$doc_url")

tools/release-all/release-all.sh

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,24 @@ repomap_keys[1]=lustre_csi_driver
2727
repomap_keys[2]=lustre_fs_operator
2828
repomap_keys[3]=nnf_mfu
2929
repomap_keys[4]=nnf_ec
30-
repomap_keys[5]=nnf_sos
31-
repomap_keys[6]=nnf_dm
32-
repomap_keys[7]=nnf_integration_test
33-
repomap_keys[8]=nnf_deploy
34-
repomap_keys[9]=nnf_doc
30+
repomap_keys[5]=nnf_storedversions_maint
31+
repomap_keys[6]=nnf_sos
32+
repomap_keys[7]=nnf_dm
33+
repomap_keys[8]=nnf_integration_test
34+
repomap_keys[9]=nnf_deploy
35+
repomap_keys[10]=nnf_doc
3536

3637
declare "repomap_${repomap_keys[0]}"='git@github.com:DataWorkflowServices/dws.git'
3738
declare "repomap_${repomap_keys[1]}"='git@github.com:HewlettPackard/lustre-csi-driver.git'
3839
declare "repomap_${repomap_keys[2]}"='git@github.com:NearNodeFlash/lustre-fs-operator.git'
3940
declare "repomap_${repomap_keys[3]}"='git@github.com:NearNodeFlash/nnf-mfu.git'
4041
declare "repomap_${repomap_keys[4]}"='git@github.com:NearNodeFlash/nnf-ec.git'
41-
declare "repomap_${repomap_keys[5]}"='git@github.com:NearNodeFlash/nnf-sos.git'
42-
declare "repomap_${repomap_keys[6]}"='git@github.com:NearNodeFlash/nnf-dm.git'
43-
declare "repomap_${repomap_keys[7]}"='git@github.com:NearNodeFlash/nnf-integration-test.git'
44-
declare "repomap_${repomap_keys[8]}"='git@github.com:NearNodeFlash/nnf-deploy.git'
45-
declare "repomap_${repomap_keys[9]}"='git@github.com:NearNodeFlash/NearNodeFlash.github.io.git'
42+
declare "repomap_${repomap_keys[5]}"='git@github.com:NearNodeFlash/nnf-storedversions-maint.git'
43+
declare "repomap_${repomap_keys[6]}"='git@github.com:NearNodeFlash/nnf-sos.git'
44+
declare "repomap_${repomap_keys[7]}"='git@github.com:NearNodeFlash/nnf-dm.git'
45+
declare "repomap_${repomap_keys[8]}"='git@github.com:NearNodeFlash/nnf-integration-test.git'
46+
declare "repomap_${repomap_keys[9]}"='git@github.com:NearNodeFlash/nnf-deploy.git'
47+
declare "repomap_${repomap_keys[10]}"='git@github.com:NearNodeFlash/NearNodeFlash.github.io.git'
4648

4749
getter() {
4850
# Getter for the associative-array-ish thingy that works in bash v3 for Mac.
@@ -235,6 +237,7 @@ get_default_branch() {
235237
local default_branch=master
236238

237239
[[ $repo_short_name = nnf_doc ]] && default_branch=main
240+
[[ $repo_short_name = nnf_storedversions_maint ]] && default_branch=main
238241
echo "$default_branch"
239242
}
240243

@@ -512,6 +515,11 @@ update_own_release_references() {
512515
update_kustomization_file "$k_yaml" controller "$release_ver" "$indent"
513516
git add "$k_yaml"
514517
;;
518+
nnf_storedversions_maint)
519+
k_yaml="config/manager"
520+
update_kustomization_file "$k_yaml" controller "$release_ver" "$indent"
521+
git add "$k_yaml"
522+
;;
515523
esac
516524

517525
if [[ $(git status -s | wc -l) -gt 0 ]]; then

tools/release-all/setup-release-env.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ nnf_gh_repo() {
107107
lustre_fs_operator) echo "NearNodeFlash/lustre-fs-operator" ;;
108108
nnf_mfu) echo "NearNodeFlash/nnf-mfu" ;;
109109
nnf_ec) echo "NearNodeFlash/nnf-ec" ;;
110+
nnf_storedversions_maint) echo "NearNodeFlash/nnf-storedversions-maint" ;;
110111
nnf_sos) echo "NearNodeFlash/nnf-sos" ;;
111112
nnf_dm) echo "NearNodeFlash/nnf-dm" ;;
112113
nnf_integration_test) echo "NearNodeFlash/nnf-integration-test" ;;

0 commit comments

Comments
 (0)