Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

testnet-automation: More knobs for rolling upgrades#12337

Closed
t-nelson wants to merge 11 commits intosolana-labs:masterfrom
t-nelson:moar-rolling-upgrade
Closed

testnet-automation: More knobs for rolling upgrades#12337
t-nelson wants to merge 11 commits intosolana-labs:masterfrom
t-nelson:moar-rolling-upgrade

Conversation

@t-nelson
Copy link
Copy Markdown
Contributor

Problem

1.2 -> 1.3 still falls over

Summary of Changes

  • Plumb genesis options to gain control over --cluster-type

@t-nelson t-nelson force-pushed the moar-rolling-upgrade branch 6 times, most recently from fbf9828 to ea41de4 Compare September 22, 2020 05:04
@ryoqun
Copy link
Copy Markdown
Contributor

ryoqun commented Sep 22, 2020

@t-nelson Please take look at this: #12390 (comment) :)

@t-nelson t-nelson force-pushed the moar-rolling-upgrade branch from ea41de4 to 102f7d2 Compare September 23, 2020 03:22
@t-nelson
Copy link
Copy Markdown
Contributor Author

t-nelson commented Sep 23, 2020

@ryoqun I've dropped the junk commits here and picked in the custom build commits

102f7d2 can be dropped once #12405 and #12406 land Dropped

6e9c14a may or may not be a good idea. It seemed to work, but I'm not sure if it'll break MacOS/Windows

@t-nelson t-nelson force-pushed the moar-rolling-upgrade branch from 102f7d2 to 6e9c14a Compare September 23, 2020 17:14
Comment thread ci/forgive-me.sh
Comment on lines +21 to +22
# Clone the specified committish
git clone "$remote" "$tmp_source_dir"
Copy link
Copy Markdown
Contributor

@ryoqun ryoqun Sep 23, 2020

Choose a reason for hiding this comment

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

Is there any reason we have to clone all new? I think we can add another worktree like this:

# Create temporal source dir to build
git fetch origin "$branch"
if [[ -n $commitish ]]; then
  git worktree add "$tmp_source_dir" $commitish
else
  git worktree add "$tmp_source_dir" FETCH_HEAD
fi

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Nope! This was just a quick and dirty script to see if I could get what I wanted working (see script file name 😅). Plenty of optimizations to be had here

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

what a quick reply. :) I updated my comment by picking something from my attempt #12390. let's unify our work for the better. :)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this way we can build off at arbitrary commit, might be useful for building with fast-changing release branches.

Comment thread ci/forgive-me.sh
remote=https://github.com/solana-labs/solana.git

cleanup_tmp_source_dir() {
rm -rf "$tmp_source_dir"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

https://github.com/solana-labs/solana/pull/12337/files#r493804567 and do this?:

git worktree remove --force "$tmp_source_dir"

Comment thread ci/forgive-me.sh
Comment on lines +28 to +29
git fetch origin "$committish":branch_to_build
git checkout branch_to_build
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

set -x
# shellcheck disable=SC2086 # Don't want to double quote $rust_version
$cargo $maybeRustVersion build $maybeReleaseFlag "${binArgs[@]}"
$cargo $maybeRustVersion build $maybeReleaseFlag --bins
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

qq: why is this needed? because of shellcheck?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

IIRC some bins were missing without

mkdir -p "$installDir/bin"
for bin in "${BINS[@]}"; do
cp -fv "target/$buildVariant/$bin" "$installDir"/bin
for bin in "target/$buildVariant/"*; do
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Idea here was basically to get rid of the manually specified bin list, so we don't have to maintain it

@stale
Copy link
Copy Markdown

stale Bot commented Sep 30, 2020

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@stale stale Bot added the stale [bot only] Added to stale content; results in auto-close after a week. label Sep 30, 2020
@t-nelson t-nelson force-pushed the moar-rolling-upgrade branch from c1bc6e1 to 1bdaf57 Compare October 9, 2020 04:16
@stale stale Bot removed the stale [bot only] Added to stale content; results in auto-close after a week. label Oct 9, 2020
@t-nelson t-nelson force-pushed the moar-rolling-upgrade branch from 1bdaf57 to 1acd93f Compare October 9, 2020 16:48
@t-nelson t-nelson force-pushed the moar-rolling-upgrade branch from 918f80a to f44ad58 Compare October 10, 2020 01:32
@stale
Copy link
Copy Markdown

stale Bot commented Oct 17, 2020

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@stale stale Bot added the stale [bot only] Added to stale content; results in auto-close after a week. label Oct 17, 2020
@stale
Copy link
Copy Markdown

stale Bot commented Oct 24, 2020

This stale pull request has been automatically closed. Thank you for your contributions.

@stale stale Bot closed this Oct 24, 2020
@t-nelson t-nelson removed the stale [bot only] Added to stale content; results in auto-close after a week. label Oct 24, 2020
@t-nelson t-nelson reopened this Oct 24, 2020
@stale
Copy link
Copy Markdown

stale Bot commented Oct 31, 2020

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@stale stale Bot added the stale [bot only] Added to stale content; results in auto-close after a week. label Oct 31, 2020
@t-nelson t-nelson removed the stale [bot only] Added to stale content; results in auto-close after a week. label Nov 2, 2020
@stale
Copy link
Copy Markdown

stale Bot commented Nov 9, 2020

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@stale stale Bot added the stale [bot only] Added to stale content; results in auto-close after a week. label Nov 9, 2020
@stale
Copy link
Copy Markdown

stale Bot commented Nov 17, 2020

This stale pull request has been automatically closed. Thank you for your contributions.

@stale stale Bot closed this Nov 17, 2020
@t-nelson t-nelson deleted the moar-rolling-upgrade branch March 2, 2021 21:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

stale [bot only] Added to stale content; results in auto-close after a week.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants