Skip to content
This repository has been archived by the owner on Aug 18, 2020. It is now read-only.

[DEVOPS-1101] nix demo/wallet integration test integration #3769

Merged
merged 2 commits into from
Oct 18, 2018

Conversation

disassembler
Copy link
Contributor

Description

Re-adds the dropped nix changes from demo cluster PR

Linked issue

https://iohk.myjetbrains.com/youtrack/issue/DEVOPS-1101

Type of change

  • 🐞 Bug fix (non-breaking change which fixes an issue)
  • 🛠 New feature (non-breaking change which adds functionality)
  • ⚠️ Breaking change (fix or feature that would cause existing functionality to change)
  • 🏭 Refactoring that does not change existing functionality but does improve things like code readability, structure etc
  • 🔨 New or improved tests for existing code
  • ⛑ git-flow chore (backport, hotfix, etc)

Developer checklist

  • I have read the style guide document, and my code follows the code style of this project.
  • If my code deals with exceptions, it follows the guidelines.
  • I have updated any documentation accordingly, if needed. Documentation changes can be reflected in opening a PR on cardanodocs.com, amending the inline Haddock comments, any relevant README file or one of the document listed in the docs directory.
  • CHANGELOG entry has been added and is linked to the correct PR on GitHub.

Testing checklist

  • I have added tests to cover my changes.
  • All new and existing tests passed.

QA Steps

Screenshots (if available)

@KtorZ
Copy link
Contributor

KtorZ commented Oct 18, 2018

Sorry it was lost during rebase / merge.
Flagging this as "DO NOT MERGE" for now following Tatyana's request to avoid merging stuff into develop for a short while.

@disassembler
Copy link
Contributor Author

@KtorZ I disagree, I think this needs merged so our demo clusters aren't in conflict in how they're started.

Copy link
Contributor

@rvl rvl left a comment

Choose a reason for hiding this comment

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

Looks good. The prepare genesis stuff is not supported by new demo cluster code, so can be deleted for now. (I would like to bring it back later though).

@rvl
Copy link
Contributor

rvl commented Oct 18, 2018

@KtorZ This is the sort of PR that would be fine to merge after a code freeze.

@rvl rvl removed the DO NOT MERGE label Oct 18, 2018
@rvl rvl merged commit f273cb7 into develop Oct 18, 2018
@rvl rvl deleted the devops-1101-demo-cluster-nix branch October 18, 2018 23:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants