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

Add support for rel/beta branch (and beta network) #193

Merged
merged 11 commits into from
Aug 1, 2019
Merged

Conversation

Karmastic
Copy link
Contributor

Summary

Adds support for standing up a long-running network to do prolonged testing against a stable branch prior to releasing it to stable.

Test Plan

Verified branch builds as desired in travis and publishes beta packages to S3. All builds passed.

I've separately created an algonet-based network mirroring the configuration of devnet (5 hosts across 5 AWS regions with 1 relay and 4 nodes on each host - 20 nodes with 5% stake each).

Once this PR is merged to master, I'll delete the rel/beta branch and we'll create a new one once we're ready to snap for the next stable release.

@Karmastic Karmastic requested review from winder and algobolson July 29, 2019 22:24
Intermittent problems running configure_dev.sh due to `brew tap cask` caused me to try to fix the reported error.
And we don't want a buildnumber.dat in master.
winder
winder previously requested changes Jul 30, 2019
Copy link
Contributor

@winder winder left a comment

Choose a reason for hiding this comment

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

Looks good, all I saw was one typo

scripts/build/nightly.sh Outdated Show resolved Hide resolved
@@ -268,7 +268,7 @@ func checkSrvRecord(dnsBootstrap string) {

func doDeleteDNS(network string, noPrompt bool, excludePattern string) bool {

if network == "" || network == "testnet" || network == "devnet" || network == "mainnet" {
if network == "" || network == "testnet" || network == "devnet" || network == "mainnet" || network == "beta" {
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: refactor into a const map lookup.

Copy link
Contributor

@algobolson algobolson left a comment

Choose a reason for hiding this comment

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

one cleanup tweak suggestion


git checkout rel/beta

# Disabled because we have static genesis files now
Copy link
Contributor

Choose a reason for hiding this comment

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

for this commented out block, cleanup rather than replicate?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry - just saw this. If i have to update again I will clean it up

algobolson and others added 2 commits July 30, 2019 17:03
* fix some branch assumptions

* wait longer

* fix rpm spec. note one way build_release.sh can hang

* s/stable/CHANNEL/; make http more killable
Addressed PR feedback.
Renamed `beta` to `betanet`.
Fixed a few minor issues found in testing.
Copy link
Contributor

@algobolson algobolson left a comment

Choose a reason for hiding this comment

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

one Go-code nice-to-have, otherwise LGTM

@@ -268,7 +268,8 @@ func checkSrvRecord(dnsBootstrap string) {

func doDeleteDNS(network string, noPrompt bool, excludePattern string) bool {

if network == "" || network == "testnet" || network == "devnet" || network == "mainnet" {
validNetworks := map[string]bool{"mainnet": true, "testnet": true, "devnet": true, "betanet": true}
Copy link
Contributor

Choose a reason for hiding this comment

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

if we're not going to make these common (here and cmd/goal/node.go ) can we at least put a comment to keep the other one up-to-date with this one (in both places) ?

Copy link
Contributor

@tsachiherman tsachiherman left a comment

Choose a reason for hiding this comment

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

I would prefer to see the
validNetworks := map[string]bool{"mainnet": true, "testnet": true, "devnet": true, "betanet": true}
defined as

protectedNetworks := map[string]bool{"mainnet": true, "testnet": true, "devnet": true, "betanet": true}

but that shouldn't block you from merging in this change.

nit : define this in a single location rather than two..

@Karmastic Karmastic removed the request for review from winder August 1, 2019 17:30
@Karmastic Karmastic dismissed winder’s stale review August 1, 2019 17:31

Typo fixed and Will's on vacation

@Karmastic Karmastic merged commit d4a37aa into master Aug 1, 2019
@Karmastic Karmastic deleted the rel/beta branch August 7, 2019 19:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants