Skip to content

smlbench single container (for comparison)#73

Merged
daviddias merged 4 commits intoplan-smlbenchfrom
plan-smlbench-single-container
Oct 20, 2019
Merged

smlbench single container (for comparison)#73
daviddias merged 4 commits intoplan-smlbenchfrom
plan-smlbench-single-container

Conversation

@jimpick
Copy link
Copy Markdown
Contributor

@jimpick jimpick commented Oct 17, 2019

For ease of comparison against PR #60 - not intended to be merged as is

This particular branch gets the smlbench test case working again ... however, it's only executing the old IPTB based test inside a single Docker instance, which is probably not what we ultimately want.

Run it with a single container, eg:

./testground -vv run --builder docker:go --runner local:docker --instances=1 smlbench/simple-add

or

./testground -vv run --builder docker:go --runner local:docker --instances=1 smlbench/simple-add-get

I modified the Dockerfile.template to call install-ipfs.sh if go_ipfs_version is set in the manifest. I also had to change the base image to debian from busybox in order to be compatible with the prebuilt IPFS binaries distributed from dist.ipfs.io. If I was to do it again, I think I'd prefer a mechanism where I could have a different Dockerfile for some test cases instead of sharing it between all test cases.

Jim Pick added 3 commits October 16, 2019 20:07
If not defined, Docker build still works.
Changed Docker base image to Debian because busybox or alpine don't
work with our precompiled ipfs binaries.

Also added a small delay when destroying the ensemble to avoid a
race.
@jimpick jimpick mentioned this pull request Oct 17, 2019
@daviddias daviddias changed the base branch from master to plan-smlbench October 18, 2019 12:33
@daviddias
Copy link
Copy Markdown
Contributor

@jimpick mind resolving the merge conflicts for a clean merge/comparison? Thank you so much for pushing for this :)

Copy link
Copy Markdown
Contributor

@daviddias daviddias left a comment

Choose a reason for hiding this comment

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

Thank you for getting the last mile of this one to work :)

@daviddias daviddias merged commit 0564610 into plan-smlbench Oct 20, 2019
@daviddias daviddias deleted the plan-smlbench-single-container branch October 20, 2019 15:36
daviddias pushed a commit that referenced this pull request Oct 20, 2019
* Get smlbench to compile (no tests)

* Include go-ipfs in Docker image when go_ipfs_version is defined

If not defined, Docker build still works.

* Get smlbench working again

Changed Docker base image to Debian because busybox or alpine don't
work with our precompiled ipfs binaries.

Also added a small delay when destroying the ensemble to avoid a
race.
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.

2 participants