Skip to content
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

Update release procedures #1871

Merged

Conversation

tnozicka
Copy link
Member

Description of your changes:
The PR brings up our release procedure to up to date with our recent infra changes and with how we've done it for v1.12.

The new procedure also no longer requires blocking master branch.

@tnozicka tnozicka added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. kind/documentation Categorizes issue or PR as related to documentation. labels Mar 28, 2024
@scylla-operator-bot scylla-operator-bot bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 28, 2024
@tnozicka tnozicka force-pushed the update-release-instructions branch 2 times, most recently from b0b0d72 to c1cef98 Compare April 2, 2024 14:06
@tnozicka
Copy link
Member Author

tnozicka commented Apr 3, 2024

#1028 (comment)
/retest

@tnozicka
Copy link
Member Author

/assign zimnx

release.md Outdated
git push upstream upstream/master:refs/heads/vX.Y
```
### Mark `master` as the next release
Moving `master` to the next release is done by creating a new `vX.Y+1.Z-alpha.0` tag for the next version. It can be either just the `git` tag or a proper `alpha` release, but given the very little difference the `beta` of the previous release, it's usability is limited to worth the effort.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Procedure should explain what we do, not leave the decision for someone who executes it. We either do alpha tags or not.

Suggested change
Moving `master` to the next release is done by creating a new `vX.Y+1.Z-alpha.0` tag for the next version. It can be either just the `git` tag or a proper `alpha` release, but given the very little difference the `beta` of the previous release, it's usability is limited to worth the effort.
Moving `master` to the next release is done by creating a new `vX.Y+1.Z-alpha.0` tag for the next version.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed

release.md Outdated
1. Enable building docs from `vX.Y` branch by adding an entry to `docs/source/conf.py`.
```
BRANCHES = ['master', 'v0.3', 'v1.0', 'v1.1', 'vX.Y']
BRANCHES = ['master', 'v1.11', 'v1.12', 'vX.Y']
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
BRANCHES = ['master', 'v1.11', 'v1.12', 'vX.Y']
BRANCHES = ['master', 'vX.Y-2', 'vX.Y-1', 'vX.Y']

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

release.md Outdated

#### From a pre-release
```
skopeo copy --all docker://quay.io/scylladb/scylla-operator:X.Y.0-rc.I docker://quay.io/scylladb/scylla-operator:X.Y.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
skopeo copy --all docker://quay.io/scylladb/scylla-operator:X.Y.0-rc.I docker://quay.io/scylladb/scylla-operator:X.Y.0
skopeo copy --all docker://quay.io/scylladb/scylla-operator:X.Y.Z-rc.I docker://quay.io/scylladb/scylla-operator:X.Y.Z

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

release.md Outdated
skopeo copy --all docker://quay.io/scylladb/scylla-operator:X.Y.0-rc.I docker://quay.io/scylladb/scylla-operator:X.Y.0
```
```
skopeo copy --all docker://quay.io/scylladb/scylla-operator:X.Y.0 docker://docker.io/scylladb/scylla-operator:X.Y.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
skopeo copy --all docker://quay.io/scylladb/scylla-operator:X.Y.0 docker://docker.io/scylladb/scylla-operator:X.Y.0
skopeo copy --all docker://quay.io/scylladb/scylla-operator:X.Y.Z docker://docker.io/scylladb/scylla-operator:X.Y.Z

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


1. Submit a PR using `master` as target branch.
### ScyllaDB User Slack
Send a post to the `#scylla-operator` channel in ScyllaDB-Users Slack based on the following template.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO we should include notable changes paragraph as well, to promote what is important.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems already included in the forum link - I've extended the description

- `#scylla-operator` channel in ScyllaDB-Users Slack
- users mailing list (https://groups.google.com/g/scylladb-users)
### Beta
`beta` is a testing release that comes from a release branch.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't explain when it's tagged.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

release.md Outdated
Moving `master` to the next release is done by creating a new `vX.Y+1.Z-alpha.0` tag for the next version. It can be either just the `git` tag or a proper `alpha` release, but given the very little difference the `beta` of the previous release, it's usability is limited to worth the effort.
```
git fetch git@github.com:scylladb/scylla-operator.git
git tag -s -a vX.Y+1.Z-alpha.0 "${revision}" -m "vX.Y+1.Z-alpha.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

${revision} is undefined

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replaced

@tnozicka tnozicka force-pushed the update-release-instructions branch from c1cef98 to 89e06a0 Compare July 1, 2024 19:11
Copy link
Contributor

scylla-operator-bot bot commented Jul 2, 2024

@tnozicka: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gke-release-script-latest c1cef98 link true /test e2e-gke-release-script-latest

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Copy link
Collaborator

@zimnx zimnx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@scylla-operator-bot scylla-operator-bot bot added the lgtm Indicates that a PR is ready to be merged. label Jul 2, 2024
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tnozicka, zimnx

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tnozicka
Copy link
Member Author

tnozicka commented Jul 2, 2024

#1996 (comment)

this is docs only
/override ci/prow/e2e-gke-parallel-clusterip

Copy link
Contributor

@tnozicka: Overrode contexts on behalf of tnozicka: ci/prow/e2e-gke-parallel-clusterip

In response to this:

#1996 (comment)

this is docs only
/override ci/prow/e2e-gke-parallel-clusterip

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@scylla-operator-bot scylla-operator-bot bot merged commit 6eb2c75 into scylladb:master Jul 2, 2024
12 checks passed
@tnozicka tnozicka deleted the update-release-instructions branch July 2, 2024 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/documentation Categorizes issue or PR as related to documentation. lgtm Indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants