[Merged by Bors] - Use latest tags for nethermind and geth in the execution engine integration test#3303
[Merged by Bors] - Use latest tags for nethermind and geth in the execution engine integration test#3303divagant-martian wants to merge 8 commits intosigp:unstablefrom
Conversation
divagant-martian
changed the title
This reverts commit 87407cd.
michaelsproul
left a comment
michaelsproul
left a comment
There was a problem hiding this comment.
Approving and merging to unblock CI, thanks Diva!
| // Update the branch | ||
| assert!(build_utils::update_branch(&repo_dir, GETH_BRANCH)); | ||
| // Get the latest tag on the branch | ||
| let last_release = build_utils::get_latest_release(&repo_dir).unwrap(); |
There was a problem hiding this comment.
I think this is slightly awkward in the case where repo_dir already existed and was checked out to a prior release. The git describe will describe the HEAD so it will just return the same tag back, and the repo will be stuck until the user manually intervenes. I don't think this is a problem for CI, however.
I guess the update_branch function is meant to address this, but it's unused in the current code. Alternatively we could do git describe origin/{branch_name} (after the git fetch), which avoids the problems of statefullness.
I'm inclined to merge this PR now as-is and we can come back for these changes if others agree?
There was a problem hiding this comment.
So I tried the describe approach and didn't work. I'll just do checkout branch, pull, fetch tags and then describe. What do you think?
There was a problem hiding this comment.
I think that's fine! I'm surprised the describe approach doesn't work though
There was a problem hiding this comment.
oh I think it might be because I testing against my lighthouse repo and I've never updated my remote master, let me try again
There was a problem hiding this comment.
yep it works
|
bors r+ |
…ration test (#3303) ## Issue Addressed Currently the execution-engine-integration test uses latest master for nethermind and geth, and right now the test fails using the latest unreleased commits. ## Proposed Changes Fix the nethermind and geth revisions the test uses to the latest tag in each repo. This way we are not continuously testing unreleased code, which might even get reverted, and reduce the failures only to releases in each one. Also improve error handling of the commands used to manage the git repos. ## Additional Info na Co-authored-by: Michael Sproul <[email protected]>
|
bors r- I'm cancelling to address what you've raised |
|
Canceled. |
|
It seems the latest Geth tag has some incompatibility, the failure doesn't seem related to your latest change |
|
the selected tag was not the right one, now should work |
|
bors r+ |
…ration test (#3303) ## Issue Addressed Currently the execution-engine-integration test uses latest master for nethermind and geth, and right now the test fails using the latest unreleased commits. ## Proposed Changes Fix the nethermind and geth revisions the test uses to the latest tag in each repo. This way we are not continuously testing unreleased code, which might even get reverted, and reduce the failures only to releases in each one. Also improve error handling of the commands used to manage the git repos. ## Additional Info na Co-authored-by: Michael Sproul <[email protected]>
|
Build failed: |
|
bors retry |
|
bors r- |
|
Canceled. |
|
bors r+ |
…ration test (#3303) ## Issue Addressed Currently the execution-engine-integration test uses latest master for nethermind and geth, and right now the test fails using the latest unreleased commits. ## Proposed Changes Fix the nethermind and geth revisions the test uses to the latest tag in each repo. This way we are not continuously testing unreleased code, which might even get reverted, and reduce the failures only to releases in each one. Also improve error handling of the commands used to manage the git repos. ## Additional Info na Co-authored-by: Michael Sproul <[email protected]>
bors
bot
changed the title
2 participants
Issue Addressed
Currently the execution-engine-integration test uses latest master for nethermind and geth, and right now the test fails using the latest unreleased commits.
Proposed Changes
Fix the nethermind and geth revisions the test uses to the latest tag in each repo. This way we are not continuously testing unreleased code, which might even get reverted, and reduce the failures only to releases in each one.
Also improve error handling of the commands used to manage the git repos.
Additional Info
na