Feat/peter.somogyvari/ci e2e tests #70
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
examples/simple-asset-transfer/quorum/platform/docker-compose.yml
Outdated
Show resolved
Hide resolved
Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
The examples were hardcoding GitHub branch references which is a moving target and makes it error prone in certain situations to have the intended code running for local tests/CI. Solved it with a pre-install npm script that runs npm pack in the root directory of the project creating an installable tarball of the latest source code that's checked out at the current moment. This strongly ties the examples of any given revision to the exact source code of BIF from that revision as well, guaranteeing that whoever/wherever does an npm install inside the examples will get the current source code of that revision packaged up as an npm dependency. that they are committed with Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
Make sure the quorum API and platform containres are on the same network so that they can interact with each other. Fixed typo in RPC port: 22000 is on the host not when conneting between containers. CI script now creates the quorum docker network itself if not already in existence. This was necessary on account of new errors that cropped in CI after the latest master rebase where docker was complaining that the external network referenced in one of the compose files was non-existent. Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
petermetz
force-pushed
the
feat/peter.somogyvari/ci-e2e-tests-compacted
branch
from
f1c58c2
to
2fa18b5
Compare
The websocket/.git folder deletion is no longer necessary on account of Web3 having been upgraded to v1.2.4 (most likely). Removal of the fabric-client-kv-org* folders is done by the runApp.sh script so we don't need the CI to take care of that either. Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
Keeps the main script a little simpler to digest. Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
Use "quorum-examples-net" instead of "quorum_quorum-examples-net". Makes the quorum upgrade path a little easier in the future (assuming quorum keeps their network name intact) Also: ci script main task now removes + recreates the network instead of just doing inspect on any pre-existing one. The upside of this is that it automatically ensures that past networks are cleaned up before we create the new one. This avoids errors in cases where the old and new network would have different subnet/gateway for example. Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
blefevre
pushed a commit
to blefevre/blockchain-integration-framework
that referenced
this pull request
Feb 4, 2020
* feat(validator): elections powered by etcd leases Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com> * fix(examples,tools): use local npm package The examples were hardcoding GitHub branch references which is a moving target and makes it error prone in certain situations to have the intended code running for local tests/CI. Solved it with a pre-install npm script that runs npm pack in the root directory of the project creating an installable tarball of the latest source code that's checked out at the current moment. This strongly ties the examples of any given revision to the exact source code of BIF from that revision as well, guaranteeing that whoever/wherever does an npm install inside the examples will get the current source code of that revision packaged up as an npm dependency. that they are committed with Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com> * fix(ci): end to end tests are now working Make sure the quorum API and platform containres are on the same network so that they can interact with each other. Fixed typo in RPC port: 22000 is on the host not when conneting between containers. CI script now creates the quorum docker network itself if not already in existence. This was necessary on account of new errors that cropped in CI after the latest master rebase where docker was complaining that the external network referenced in one of the compose files was non-existent. Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com> * refactor(ci.sh): clean up cmds no longer needed The websocket/.git folder deletion is no longer necessary on account of Web3 having been upgraded to v1.2.4 (most likely). Removal of the fabric-client-kv-org* folders is done by the runApp.sh script so we don't need the CI to take care of that either. Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com> * chore(package-lock): updating lock npm lock file Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com> * refactor(ci): moved log dumping to new script Keeps the main script a little simpler to digest. Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com> * refactor(examples): rename quorum docker network Use "quorum-examples-net" instead of "quorum_quorum-examples-net". Makes the quorum upgrade path a little easier in the future (assuming quorum keeps their network name intact) Also: ci script main task now removes + recreates the network instead of just doing inspect on any pre-existing one. The upside of this is that it automatically ensures that past networks are cleaned up before we create the new one. This avoids errors in cases where the old and new network would have different subnet/gateway for example. Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com> * chore(npm): update lock file Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the narrowed down, compacted version of the draft PR achieving the same thing: #62
Needs #31 to be merged first!