Switching to stable-track #11377

General-Beck · 2020-01-10T13:23:45Z

remove beta from building scripts
stable = latest

s3krit · 2020-01-10T14:10:34Z

LGTM. Will keep this open until we are ready to switch to a single release track

TriplEight

Don't you think that it also makes sense to remove "nightly" as well?
I searched "beta" in code and found more mentions than changed here:

➤ rg beta -g '!*.md'
parity/configuration.rs
984:                            "beta" => ReleaseTrack::Beta,
1517:           let conf2 = parse(&["parity", "--no-download", "--auto-update=all", "--release-track=beta", "--auto-update-delay=300", "--auto-update-check-frequency=100"]);

scripts/gitlab/publish-snap.sh
14:  beta) export GRADE="stable" CHANNEL="beta";;

scripts/gitlab/test-linux.sh
2:# ARGUMENT $1 Rust flavor to run test with (stable/beta/nightly)

scripts/gitlab/rust-changes.sh
10:  (beta|stable)

util/version/Cargo.toml
11:# This versions track. Should be changed to `stable` or `beta` when on respective branches.

parity/cli/mod.rs
299:                    "Set which release track we should use for updates. TRACK can be one of: stable - Stable releases; beta - Beta releases; nightly - Nightly releases (unstable); testing - Testing releases (do not use); current - Whatever track this executable was released on.",

updater/src/types/release_track.rs
41:                     ReleaseTrack::Beta => "beta",
53:                     "beta" => ReleaseTrack::Beta,
104:            assert_eq!(ReleaseTrack::Beta, "beta".into());
113:            assert_eq!("beta", ReleaseTrack::Beta.to_string());

scripts/docker/hub/publish-docker.sh
26:    "beta")
27:        echo "Docker TAGs - 'parity/parity:beta', 'parity/parity:latest', \
32:            --tag "parity/parity:beta" \
36:        docker push "parity/parity:beta";

util/network/src/client_version.rs
461:    pub fn client_capabilities_when_parity_beta_version_then_not_handles_large_requests_true() {
465:                    "2.4.0-beta",

util/network-devp2p/src/ip_utils.rs
36:/// Socket address extension for rustc beta. To be replaces with now unstable API

util/version/src/lib.rs
33:// ^^^ should be reset in Cargo.toml to "stable" or "beta" according to the release branch.

rpc/src/v1/tests/mocked/parity_set.rs
94:     let response = r#"{"jsonrpc":"2.0","result":{"binary":"0x00000000000000000000000000000000000000000000000000000000000005e6","fork":15100,"is_critical":true,"version":{"hash":"0x0000000000000000000000000000000000000097","track":"beta","version":{"major":1,"minor":5,"patch":1}}},"id":1}"#;

rpc/src/v1/tests/mocked/parity.rs
133:    let response = r#"{"jsonrpc":"2.0","result":{"hash":"0x0000000000000000000000000000000000000096","track":"beta","version":{"major":1,"minor":5,"patch":0}},"id":1}"#;
143:    let response = r#"{"jsonrpc":"2.0","result":{"fork":15100,"minor":null,"this_fork":15000,"track":{"binary":"0x00000000000000000000000000000000000000000000000000000000000005e6","fork":15100,"is_critical":true,"version":{"hash":"0x0000000000000000000000000000000000000097","track":"beta","version":{"major":1,"minor":5,"patch":1}}}},"id":1}"#;

TriplEight · 2020-01-10T19:53:30Z

@s3krit don't forget to edit README, it also mentions beta

dvdplm

When this lands, will we still be able to make auto releases for the current parity versions?

parity/cli/mod.rs

s3krit · 2020-01-13T12:22:43Z

Don't you think that it also makes sense to remove "nightly" as well?
I searched "beta" in code and found more mentions than changed here:

@TriplEight I don't see any reason to remove nightly releases, no. I don't have any numbers on how many people are on the nightly track, but the nightly release publishing doesn't really incur any additional overhead in terms of publishing the release (i.e., it is all done hands-off via CI jobs etc).

TriplEight · 2020-01-13T14:16:44Z

Well, what we do here is getting rid of "beta" everywhere, right? We are not removing nightly.
And apparently it involves some changes on Rust.

scripts/gitlab/test-linux.sh

Co-Authored-By: Denis Pisarev <denis.pisarev@parity.io>

…into stable-track

s3krit · 2020-01-17T14:50:05Z

parity/configuration.rs

@@ -1512,10 +1510,8 @@ mod tests {
 	#[test]
 	fn should_parse_updater_options() {
 		// when
-		let conf0 = parse(&["parity", "--release-track=testing"]);
-		let conf1 = parse(&["parity", "--auto-update", "all", "--no-consensus", "--auto-update-delay", "300"]);
-		let conf2 = parse(&["parity", "--no-download", "--auto-update=all", "--release-track=beta", "--auto-update-delay=300", "--auto-update-check-frequency=100"]);


If we're removing these, we also need to remove the asserts just below in this file. This is leading to tests being broken: https://gitlab.parity.io/parity/parity-ethereum/-/jobs/356325

This reverts commit 45c72f6.

Found further issues - test-linux fails

util/version/Cargo.toml

ordian · 2020-01-20T15:33:07Z

could you merge with master, the diff is quite noisy

ordian

The changes look sane to me. I wonder what would happen to the beta track with the autoupdater on? Will the nodes fail to update silently? Might be worth communicating this in the release notes.

s3krit · 2020-01-22T16:17:04Z

The changes look sane to me. I wonder what would happen to the beta track with the autoupdater on? Will the nodes fail to update silently? Might be worth communicating this in the release notes.

The actual answer is 'nothing', since no releases in a beta branch will happen again, so the publish-onchain job will never run on the beta branch, so no updates for beta will be pushed on-chain. And yeah correct, gonna reach out and communicate very clearly that those on beta will need to switch to stable to continue getting updates, and those running stable will be upgrading 2 minor versions, which necessitates a db migration, thus they can't just switch back to v2.5

TriplEight

LGTM!

parity/cli/mod.rs

* sccache "stop server" - > "show stats" * remove testing and beta from update, cli, etc. * Beta->Nigthly updater * Beta->Nightly * ->Nightly and fix * updater ->Stable * Testing->Nightly * Update scripts/gitlab/test-linux.sh Co-Authored-By: Denis Pisarev <denis.pisarev@parity.io> * sccache "stop server" - > "show stats" * remove testing and beta from update, cli, etc. * Beta->Nigthly updater * Beta->Nightly * ->Nightly and fix * updater ->Stable * Testing->Nightly * Update scripts/gitlab/test-linux.sh Co-Authored-By: Denis Pisarev <denis.pisarev@parity.io> * Update CHANGELOGs and version * temporarily allow darwin and windows to be built on any branch * fix check-benches job * Revert "temporarily allow darwin and windows to be built on any branch" This reverts commit 45c72f6. * fix check-benches job * Revert changing track from `nightly` to `stable` * fix test: rpc_parity_upgrade_ready * fix tests: rpc_parity_version_info, rpc_parity_releases_info Co-authored-by: Denis Pisarev <denis.pisarev@parity.io> Co-authored-by: s3krit <pugh@s3kr.it>

dvdplm

minor grumbles

dvdplm · 2020-01-21T08:17:18Z

docs/CHANGELOG-2.5.md

 This release stabilises the 2.5 branch.

 As of today, Parity-Ethereum 2.4 reaches end of life and everyone is
 encouraged to upgrade.

 ## Parity-Ethereum [v2.5.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.4)

-Parity Ethereum v2.5.4-stable is a security update that addresses servo/rust-smallvec#148
+Parity Ethereum v2.5.4-beta is a security update that addresses servo/rust-smallvec#148


Was this really a beta release?

Yep. I believe it was a typo originally that marked v2.5.4 as stable. We didn't stabilise v2.5 until v2.5.5: https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.5

dvdplm · 2020-01-24T08:36:17Z

rpc/src/v1/types/consensus_status.rs

@@ -49,8 +49,6 @@ impl Into<ConsensusCapability> for CapState {
 pub enum ReleaseTrack {
 	/// Stable track.
 	Stable,
-	/// Beta track.
-	Beta,
 	/// Nightly track.
 	Nightly,
 	/// Testing track.


Is there a reason we keep Testing here but remove it from updater/src/types/release_track.rs? Should we remove it here too?

scripts/docker/hub/publish-docker.sh

…pstream * master: Add POSDAO transition and malice report queue. (#11245) update master/nightly version: v2.8.0 (#11419) ethcore/res: remove morden testnet (#11392) fix: export hardcoded sync format (#11416) update hardcoded headers: mainnet and ropsten (#11414) AuthorityEngine: Minor cleanups. (#11408) Update POA bootnodes (#11411) Add EtherCore support (#11402) verification: fix race same block + misc (#11400) Update ProgPoW to 0.9.3 (#11407) update classic testnet bootnodes (#11398) dependencies: bump `derive_more v0.99` (#11405) engine error: remove faulty/unused `From` (#11404) Switching to stable-track (#11377) ethcore/res: fix ethereum classic chainspec blake2_f activation block num (#11391) Update copyright notice 2020 (#11386)

sccache "stop server" - > "show stats"

ae5d138

General-Beck added A0-pleasereview 🤓 Pull request needs code review. M1-ci 🙉 Continuous integration. labels Jan 10, 2020

General-Beck requested review from dvdplm, s3krit and TriplEight January 10, 2020 13:23

General-Beck self-assigned this Jan 10, 2020

TriplEight suggested changes Jan 10, 2020

View reviewed changes

remove testing and beta from update, cli, etc.

81d048a

General-Beck and others added 5 commits January 10, 2020 23:01

Beta->Nigthly updater

d93a21a

Beta->Nightly

eccd90c

->Nightly and fix

7e127c6

updater ->Stable

b648d85

Testing->Nightly

7d922c9

dvdplm reviewed Jan 13, 2020

View reviewed changes

parity/cli/mod.rs Show resolved Hide resolved

s3krit reviewed Jan 13, 2020

View reviewed changes

scripts/gitlab/test-linux.sh Outdated Show resolved Hide resolved

TriplEight reviewed Jan 13, 2020

View reviewed changes

scripts/gitlab/test-linux.sh Outdated Show resolved Hide resolved

Update scripts/gitlab/test-linux.sh

b18624f

Co-Authored-By: Denis Pisarev <denis.pisarev@parity.io>

ordian added this to the 2.7 milestone Jan 13, 2020

General-Beck and others added 7 commits January 17, 2020 13:19

sccache "stop server" - > "show stats"

cbda26d

remove testing and beta from update, cli, etc.

11490ff

Beta->Nigthly updater

e6600c9

Beta->Nightly

215bcc5

->Nightly and fix

7b17d34

updater ->Stable

dc62eec

Testing->Nightly

7050983

s3krit and others added 4 commits January 17, 2020 13:19

Update scripts/gitlab/test-linux.sh

33f7bc8

Co-Authored-By: Denis Pisarev <denis.pisarev@parity.io>

Update CHANGELOGs and version

69a0c61

temporarily allow darwin and windows to be built on any branch

45c72f6

Merge branch 'stable-track' of github.com:paritytech/parity-ethereum …

d16abc4

…into stable-track

s3krit suggested changes Jan 17, 2020

View reviewed changes

fix check-benches job

98d5d12

s3krit previously approved these changes Jan 20, 2020

View reviewed changes

Revert "temporarily allow darwin and windows to be built on any branch"

e2d11a1

This reverts commit 45c72f6.

fix check-benches job

ef31e20

ordian reviewed Jan 20, 2020

View reviewed changes

util/version/Cargo.toml Outdated Show resolved Hide resolved

s3krit added 4 commits January 20, 2020 16:51

Merge branch 'master' into stable-track

01c29f7

Revert changing track from nightly to stable

c154040

fix test: rpc_parity_upgrade_ready

bc524b6

fix tests: rpc_parity_version_info, rpc_parity_releases_info

71f3709

ordian approved these changes Jan 22, 2020

View reviewed changes

TriplEight approved these changes Jan 22, 2020

View reviewed changes

parity/cli/mod.rs Show resolved Hide resolved

s3krit merged commit e1d06ef into master Jan 22, 2020

dvdplm reviewed Jan 24, 2020

View reviewed changes

s3krit deleted the stable-track branch January 27, 2020 17:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switching to stable-track #11377

Switching to stable-track #11377

General-Beck commented Jan 10, 2020

s3krit commented Jan 10, 2020

TriplEight left a comment

TriplEight commented Jan 10, 2020

dvdplm left a comment

s3krit commented Jan 13, 2020

TriplEight commented Jan 13, 2020

s3krit Jan 17, 2020

ordian commented Jan 20, 2020

ordian left a comment •

edited

Loading

s3krit commented Jan 22, 2020

TriplEight left a comment

dvdplm left a comment

dvdplm Jan 21, 2020

s3krit Jan 24, 2020

dvdplm Jan 24, 2020

Switching to stable-track #11377

Switching to stable-track #11377

Conversation

General-Beck commented Jan 10, 2020

s3krit commented Jan 10, 2020

TriplEight left a comment

Choose a reason for hiding this comment

TriplEight commented Jan 10, 2020

dvdplm left a comment

Choose a reason for hiding this comment

s3krit commented Jan 13, 2020

TriplEight commented Jan 13, 2020

s3krit Jan 17, 2020

Choose a reason for hiding this comment

ordian commented Jan 20, 2020

ordian left a comment • edited Loading

Choose a reason for hiding this comment

s3krit commented Jan 22, 2020

TriplEight left a comment

Choose a reason for hiding this comment

dvdplm left a comment

Choose a reason for hiding this comment

dvdplm Jan 21, 2020

Choose a reason for hiding this comment

s3krit Jan 24, 2020

Choose a reason for hiding this comment

dvdplm Jan 24, 2020

Choose a reason for hiding this comment

ordian left a comment •

edited

Loading