-
Notifications
You must be signed in to change notification settings - Fork 496
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove Examples link from release email #638
Conversation
should we also update |
@ixdy good question, looks like toolbox/relnotes was meant to replace the bash script, but hasn't yet been integrated? #434 (comment) |
@dougm let's fix both then (and then tangentially figure out what to do with |
@ixdy sounds good, done. |
ad682c2
to
a7af415
Compare
Change looks reasonable from a basic review perspective, but...have you tested this? Would like to know it runs ok, ahead of the final release. |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dougm, ixdy The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
@@ -222,8 +222,7 @@ create_body () { | |||
echo | |||
echo "# $title" | |||
echo | |||
echo "[Documentation](https://docs.k8s.io) &" \ | |||
"[Examples](https://releases.k8s.io/$CURRENT_BRANCH/examples)" | |||
echo "[Documentation](https://docs.k8s.io)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tpepper this hunk is the only change that applies to release-notify
, run by anago here:
Lines 445 to 449 in 920dcfb
logrun -s relnotes $RELEASE_VERSION_PRIME --release-tars=$release_tars \ | |
--branch=${PARENT_BRANCH:-$RELEASE_BRANCH} --htmlize-md \ | |
--markdown-file=$RELEASE_NOTES_MD \ | |
--html-file=$RELEASE_NOTES_HTML \ | |
--release-bucket=$RELEASE_BUCKET || return 1 |
The *.go changes below are not (yet) used by release-notify
, though I did test them via go test
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks safe to me, at least.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to clarify, anago runs the command above, which drops the relnotes into the given --release-bucket
. The release-notify
script downloads these notes when composing the email:
Lines 1042 to 1052 in 920dcfb
local archive_root="gs://$bucket/archive/anago-$RELEASE_VERSION" | |
((FLAGS_nomock)) || mailto=$GCP_USER | |
mailto=${FLAGS_mailto:-$mailto} | |
# Announcement file is stored normally in WORKDIR, else check GCS. | |
if [[ -f "$announcement_file" ]]; then | |
announcement_text="$announcement_file" | |
else | |
announcement_file="$archive_root/announcement.html" | |
if ! $GSUTIL cp $announcement_file $announcement_text >/dev/null 2>&1; then |
@ixdy @tpepper @neolit123 can you lift the 'hold' if you are ok with this? |
change LGTM. isn't there a way for having a dry-run - e.g. comment out sendmail calls etc and looking at the generated email? |
I could do a mock build with my k/release PR branch, but that'll take quite a while. Otherwise, there's other stuff that needs to be faked to do a local test, such as release tars: Line 202 in fc6c2bb
Don't think it's worth the trouble in this case, since I can just copy-n-paste the 1 line that's been added :) % echo "[Documentation](https://docs.k8s.io)"
[Documentation](https://docs.k8s.io) Also note that the |
ACK, i guess if the sendemail step is skipped or manual-ed then the email body can be amended before sending. also, this will verify if the generation step is correct. /hold cancel |
I'll also do a full mock build when we have green light for the release and can double check the relnotes looks good before doing the |
Fixes #629