Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,15 @@ development and testing.
Tools | Description
:---: | --
[`krel`](/cmd/krel) | Kubernetes Release Toolbox<br/>This is the new golang based tool for managing releases
[`gcbmgr`](/gcbmgr) | Google Cloud Builder Manager:<br/>This is the main entry point for release managers for producing releases. All release types can be staged and later released using this method.
[`anago`](/anago) | Release Tool:<br/>The main driver for creating staged builds and releases. This is what runs inside GCB after a job is submitted using `gcbmgr`.
[`anago`](/anago) | Release Tool:<br/>The main driver for creating staged builds and releases. This is what runs inside GCB after a job is submitted using `krel gcbmgr`.
[`find_green_build`](/find_green_build) | Asks Jenkins for a good build to use.
[`release-notes`](/cmd/release-notes) | Scrape GitHub for release notes.<br/>See [Release Notes Gathering](#release-notes-gathering) for more information.
[`prin`](/prin) | To show release tags of a particular PR or commit.
[`push-build.sh`](/push-build.sh) | Pushes a developer build or CI Jenkins build up to GCS.
[`script-template`](/script-template) | Generates a script template in the kubernetes/release ecosystem.
[`testgridshot`](/testgridshot) | Screenshots failing testgrid dashboards and creates a markdown stub that can be copied and pasted into a GitHub issue comment.<br/>This makes it easier to create comments like [this][shot-issue] as part of the release process.

For information on how to use `gcbmgr` and `anago`, see the [Branch Manager Handbook]
For information on how to use `krel` and `anago`, see the [Branch Manager Handbook]

[kubernetes/kubernetes]: https://git.k8s.io/kubernetes
[Branch Manager Handbook]: https://git.k8s.io/sig-release/release-engineering/role-handbooks/branch-manager.md
Expand Down
16 changes: 5 additions & 11 deletions anago
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ prepare_workspace () {
# Check if locally staged directory contains all of the RELEASE_VERSIONs for
# this release type
if ((FLAGS_stage)) || ! found_staged_location ${RELEASE_VERSION[@]}; then
# GCB releases (gcbmgr release) requires a found staged build to use
# GCB releases (krel gcbmgr --release) requires a found staged build to use
if ! ((FLAGS_stage)) && ((FLAGS_gcb)); then
logecho "$FATAL: Releasing from GCB requires a staged" \
"--buildversion=<buildversion>"
Expand Down Expand Up @@ -1495,7 +1495,7 @@ common::timestamp begin
if ! ((FLAGS_gcb)); then
if ((FLAGS_nomock)); then
common::exit 1 "$FATAL: --nomock is no longer available on the" \
"command-line/desktop. Use 'gcbmgr'."
"command-line/desktop. Use 'krel gcbmgr'."
fi

logecho $HR
Expand Down Expand Up @@ -1773,18 +1773,12 @@ done
# if --stage, we're done
if ((FLAGS_stage)); then
((FLAGS_nomock)) && EXTRA_FLAGS+=("--nomock")
((FLAGS_official)) && EXTRA_FLAGS+=("--official")
((FLAGS_rc)) && EXTRA_FLAGS+=("--rc")
((FLAGS_official)) && EXTRA_FLAGS+=("--type official")
((FLAGS_rc)) && EXTRA_FLAGS+=("--type rc")
logecho
logecho "To release this staged build, run:"
logecho
logecho -n "$ gcbmgr release ${EXTRA_FLAGS[*]} $RELEASE_BRANCH" \
"--buildversion=$JENKINS_BUILD_VERSION"
logecho
logecho
logecho "-OR-"
logecho
logecho -n "$ anago ${EXTRA_FLAGS[*]} $RELEASE_BRANCH" \
logecho -n "$ krel gcbmgr --release ${EXTRA_FLAGS[*]} $RELEASE_BRANCH" \
"--buildversion=$JENKINS_BUILD_VERSION"
logecho
logecho
Expand Down
Loading