Use latest tags for nethermind and geth in the execution engine integration 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 <micsproul@gmail.com>
This commit is contained in:
Divma
2022-07-03 05:36:51 +00:00
parent be4e261e74
commit 66bb5c716c
3 changed files with 102 additions and 56 deletions

View File

@@ -23,20 +23,17 @@ pub fn build(execution_clients_dir: &Path) {
if !repo_dir.exists() {
// Clone the repo
assert!(build_utils::clone_repo(
execution_clients_dir,
GETH_REPO_URL
));
build_utils::clone_repo(execution_clients_dir, GETH_REPO_URL).unwrap();
}
// Checkout the correct branch
assert!(build_utils::checkout_branch(&repo_dir, GETH_BRANCH));
// 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, GETH_BRANCH).unwrap();
build_utils::checkout(&repo_dir, dbg!(&last_release)).unwrap();
// Build geth
build_utils::check_command_output(build_result(&repo_dir), "make failed");
build_utils::check_command_output(build_result(&repo_dir), || {
format!("geth make failed using release {last_release}")
});
}
/*
@@ -75,7 +72,7 @@ impl GenericExecutionEngine for GethEngine {
.output()
.expect("failed to init geth");
build_utils::check_command_output(output, "geth init failed");
build_utils::check_command_output(output, || "geth init failed".into());
datadir
}