Skip to content

Commit 1e629cb

Browse files
authored
release-all: Update the docs with the nnf-deploy release (#280)
A release of the docs should have a reference to the matching nnf-deploy release, so the two are kept in sync. Signed-off-by: Dean Roehrich <dean.roehrich@hpe.com>
1 parent 6ee403f commit 1e629cb

2 files changed

Lines changed: 26 additions & 14 deletions

File tree

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

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ do_fail() {
3434

3535
WORKSPACE="workingspace"
3636
TARGET_NNF_RELEASE=
37-
SKIP_DOCS=
3837
DO_COMMIT=
3938

4039
usage() {
@@ -43,9 +42,6 @@ usage() {
4342
echo
4443
echo " -C Commit the new release notes. First, run without"
4544
echo " this so you can review the notes."
46-
echo " -D Skip the docs repo. If the docs repo did not have"
47-
echo " updates for this NNF release, then specify this"
48-
echo " option to skip it."
4945
echo " -r nnf_release Latest NNF release tag, including the leading 'v'."
5046
echo " This must refer to a completed NNF release,"
5147
echo " including the docs repo, and it must be the most"
@@ -55,14 +51,11 @@ usage() {
5551
echo
5652
}
5753

58-
while getopts "CDr:w:h" opt; do
54+
while getopts "Cr:w:h" opt; do
5955
case $opt in
6056
C)
6157
DO_COMMIT=yes
6258
;;
63-
D)
64-
SKIP_DOCS=yes
65-
;;
6659
r)
6760
TARGET_NNF_RELEASE="$OPTARG"
6861
;;
@@ -389,12 +382,10 @@ dep_url="$NNF_DEPLOY_URL"
389382
dep_name=$(get_repo_dir_name "$dep_url")
390383
check_release_vX "$dep_repo_short_name" "$dep_name" "$dep_url" "releases/v0"
391384

392-
if [[ -z $SKIP_DOCS ]]; then
393-
doc_repo_short_name="nnf_doc"
394-
doc_url="$NNF_DOC_URL"
395-
doc_name=$(get_repo_dir_name "$doc_url")
396-
check_release_vX "$doc_repo_short_name" "$doc_name" "$doc_url" "releases/v0"
397-
fi
385+
doc_repo_short_name="nnf_doc"
386+
doc_url="$NNF_DOC_URL"
387+
doc_name=$(get_repo_dir_name "$doc_url")
388+
check_release_vX "$doc_repo_short_name" "$doc_name" "$doc_url" "releases/v0"
398389

399390
if [[ -n $NNF_DEPLOY_RELEASE && -f $RELEASE_PAGE ]]; then
400391
if [[ -n $DO_COMMIT ]]; then

tools/release-all/release-all.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,23 @@ update_nnf_mfu_release_references() {
578578
fi
579579
}
580580

581+
# Update nnf-docs for the latest nnf-deploy release version.
582+
update_nnf_release_reference() {
583+
local indent="$1"
584+
local yml="mkdocs.yml"
585+
586+
[[ ! -f $yml ]] && return
587+
nnf_deploy_release=$(find_latest_release nnf_deploy "$indent")
588+
if [[ -z $nnf_deploy_release ]]; then
589+
do_fail "${indent}Unable to get nnf-deploy releases"
590+
fi
591+
msg "${indent}Current latest nnf-deploy release is $nnf_deploy_release"
592+
sed -i.bak -e 's/^# Release: .*/# Release: '"$nnf_deploy_release"'/' $yml || do_fail "${indent}Failed to replace nnf-deploy release reference"
593+
rm -f $yml.bak
594+
git add $yml
595+
git commit -s -m "Update nnf-deploy release reference" || do_fail "${indent}Failure updating nnf-deploy release reference"
596+
}
597+
581598
# Update lustre-fs-operator, lustre-csi-driver for
582599
# nnf-deploy's config/repositories.yaml.
583600
update_remote_release_references() {
@@ -760,6 +777,10 @@ check_repo_release_vX() {
760777
fi
761778
verify_clean_workarea "$indent"
762779
make || do_fail "${indent}Failure building the nnf-deploy binary."
780+
781+
elif [[ $repo_short_name == nnf_doc ]]; then
782+
update_nnf_release_reference "$indent"
783+
verify_clean_workarea "$indent"
763784
fi
764785

765786
if [[ $(git log --oneline "$branch...HEAD" | wc -l) -gt 0 ]]; then

0 commit comments

Comments
 (0)