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

bincheck tweaks.#50

Merged
mberhault merged 1 commit intomasterfrom
marc/bincheck_tweaks
Jun 13, 2018
Merged

bincheck tweaks.#50
mberhault merged 1 commit intomasterfrom
marc/bincheck_tweaks

Conversation

@mberhault
Copy link
Copy Markdown
Contributor

@mberhault mberhault commented Jun 13, 2018 •
edited
Loading

I created a release-2.0 branch from master before this change.

  • run cockroach version to make CI outputs clearer
  • add ability to run against test release builds (test: prefix in
    VERSION)
  • example for encryption (disabled for now, no builds have the gen
    command)

@mberhault
Copy link
Copy Markdown
Contributor Author

mberhault commented Jun 13, 2018

I'll be adding more things including:

  • run with encryption
  • ability to run edge binaries

@mberhault mberhault force-pushed the marc/bincheck_tweaks branch 6 times, most recently from 9ea05e8 to 13363a5 Compare June 13, 2018 14:23
@mberhault
Copy link
Copy Markdown
Contributor Author

mberhault commented Jun 13, 2018

Added ability to run against binaries from the test release build pipeline by setting test:v... in the VERSION file. Encryption is currently disabled as cockroach gen encryption-key does not exist in the uploaded builds. I'll run a test release build later and try it.

@mberhault mberhault force-pushed the marc/bincheck_tweaks branch from 13363a5 to afd834d Compare June 13, 2018 14:26
@mberhault mberhault requested a review from benesch June 13, 2018 14:26
@mberhault mberhault force-pushed the marc/bincheck_tweaks branch from afd834d to ce3cc85 Compare June 13, 2018 14:33
@mberhault mberhault mentioned this pull request Jun 13, 2018
Merged
@mberhault mberhault force-pushed the marc/bincheck_tweaks branch from 71af221 to dcf97f6 Compare June 13, 2018 15:35
@mberhault
Copy link
Copy Markdown
Contributor Author

mberhault commented Jun 13, 2018

Latest run is with encryption enabled using a test release build of cockroachdb/cockroach#26649. Surprisingly enough, all platforms are happy, I was definitely not expecting it to work on Windows. The tests technically fail because 26649 is definitely not the version number reported by cockroach.

@mberhault mberhault force-pushed the marc/bincheck_tweaks branch from dcf97f6 to ce3cc85 Compare June 13, 2018 16:40
benesch
benesch approved these changes Jun 13, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@benesch benesch left a comment

Choose a reason for hiding this comment

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

LGTM once you finish debugging.

test-windows Outdated
base=cockroach-$(<VERSION).windows-6.2-amd64
# Download the binary based on the VERSION file. This sets the COCKROACH_VERSION env variable
# and downloads the binary in ./mnt/
. "$(dirname "$0")/download_binary.sh" "windows-6.2-amd64.zip"
Copy link
Copy Markdown
Contributor

@benesch benesch Jun 13, 2018

Choose a reason for hiding this comment

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

I'd either extract root=$(dirname "$0") and adjust the invocation of bincheck below to be relative to $root—or continue not supporting execution with a different CWD and hardcode this to ./download_binary.sh.

Copy link
Copy Markdown
Contributor Author

@mberhault mberhault Jun 13, 2018

Choose a reason for hiding this comment

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

Done, switched to ./download_binary.sh.

@mberhault mberhault changed the title WIP: bincheck tweaks. bincheck tweaks. Jun 13, 2018
@mberhault mberhault force-pushed the marc/bincheck_tweaks branch 3 times, most recently from 89b1251 to 7448eb4 Compare June 13, 2018 16:48
bincheck tweaks.
709bbdd 
I created a release-2.0 branch from master before this change.

* run `cockroach version` to make CI outputs clearer
* add ability to run against test release builds (`test:` prefix in
VERSION)
* example for encryption (disabled for now, no builds have the gen
command)
@mberhault mberhault force-pushed the marc/bincheck_tweaks branch from 7448eb4 to 709bbdd Compare June 13, 2018 16:50
@mberhault
Copy link
Copy Markdown
Contributor Author

mberhault commented Jun 13, 2018

This is ready. VERSION is back to the latest alpha and encryption is commented out (it won't work until the next alpha).

@mberhault mberhault merged commit 407be8d into master Jun 13, 2018
@mberhault mberhault deleted the marc/bincheck_tweaks branch June 13, 2018 16:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@benesch benesch benesch approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mberhault @benesch