Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use cabbage tests from a separate repo #1636

Merged
merged 22 commits into from
Jul 20, 2020
Merged

use cabbage tests from a separate repo #1636

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fbb8335
use cabbage tests from a separate repo
ayrat555 Jul 9, 2020
7c6fc3b
add cabbage tests as submodule
ayrat555 Jul 9, 2020
d380bd5
change branch
ayrat555 Jul 9, 2020
8a9849b
update specs to the latest commit
ayrat555 Jul 9, 2020
681904f
fix reorg step
ayrat555 Jul 9, 2020
5ad9593
fix dir
ayrat555 Jul 9, 2020
e4a3592
fix barebone
ayrat555 Jul 9, 2020
cb9242b
print geth logs for reorg
ayrat555 Jul 9, 2020
bb4cd32
update specs repo
ayrat555 Jul 10, 2020
261b0a9
Merge branch 'master' into use-cabbage-tests-from-separate-repo
ayrat555 Jul 10, 2020
b7ba418
remove submodule
ayrat555 Jul 14, 2020
fc4ced4
update specs
ayrat555 Jul 14, 2020
e10edfb
Merge branch 'master' into use-cabbage-tests-from-separate-repo
ayrat555 Jul 14, 2020
8b19f4a
add version 2 docker-compose
ayrat555 Jul 14, 2020
5254ca4
update specs repo
ayrat555 Jul 14, 2020
0578a0f
move logging command to makefile
ayrat555 Jul 14, 2020
3c8f727
fix geth logs
ayrat555 Jul 14, 2020
9512440
add README
ayrat555 Jul 17, 2020
0de04aa
Merge branch 'master' into use-cabbage-tests-from-separate-repo
ayrat555 Jul 17, 2020
246a680
add docker-compose ver 2 reorg compose file
ayrat555 Jul 20, 2020
8df9915
use the latest version of specs repo
ayrat555 Jul 20, 2020
18f3d15
Merge branch 'master' into use-cabbage-tests-from-separate-repo
ayrat555 Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,11 @@ jobs:
image: ubuntu-1604:201903-01
steps:
- checkout
- run:
name: "Pull Submodules"
command: |
git submodule init
git submodule update --remote
- run:
name: Setup data dir
command: |
Expand Down Expand Up @@ -536,6 +541,11 @@ jobs:
REORG: true
steps:
- checkout
- run:
name: "Pull Submodules"
command: |
git submodule init
git submodule update --remote
- run:
name: Setup data dir
command: |
Expand Down Expand Up @@ -581,19 +591,23 @@ jobs:
key: v2-mix-specs-cache-{{ .Branch }}-{{ checksum "mix.lock" }}
- run:
name: Print watcher logs
command: docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-reorg.yml -f ./priv/cabbage/docker-compose-cabbage.yml logs --follow watcher
command: docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow watcher
Copy link
Contributor

Choose a reason for hiding this comment

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

how do we name this better, docker-compose-2-specs is confusing I think...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@InoMurko it means the docker-compose version 2. the childchain users version 3. what do you think about docker-compose-version-2-specs?

Copy link
Contributor

Choose a reason for hiding this comment

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

oh, okay... that's the reason then. perhaps there's two things:

  • should we name them by functionality?
  • should we wrap these into makefile recipes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@InoMurko I moved to makefile. It doesn't have any functionality, it only overrides 2 env variables

background: true
- run:
name: Print watcher_info logs
command: docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-reorg.yml -f ./priv/cabbage/docker-compose-cabbage.yml logs --follow watcher_info
command: docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow watcher_info
background: true
- run:
name: Print childchain logs
command: docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-reorg.yml -f ./priv/cabbage/docker-compose-cabbage.yml logs --follow childchain
command: docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow childchain
background: true
- run:
name: Print geth logs
command: docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow | grep "geth"
background: true
- run:
name: Print reorg logs
command: docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-reorg.yml -f ./priv/cabbage/docker-compose-cabbage.yml logs --follow | grep "reorg"
command: docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow | grep "reorg"
background: true
- run:
name: Run specs
Expand All @@ -612,6 +626,11 @@ jobs:
TERM: xterm-256color
steps:
- checkout
- run:
name: "Pull Submodules"
command: |
git submodule init
git submodule update --remote
- run: echo 'export PATH=~/.cargo/bin:$PATH' >> $BASH_ENV
- run:
name: Start geth, postgres and pull in blockchain snapshot
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "priv/cabbage"]
path = priv/cabbage
url = git@github.com:omgnetwork/specs.git
branch = init-specs
1 change: 1 addition & 0 deletions priv/cabbage
Open in desktop
Submodule cabbage added at edbed3
12 changes: 0 additions & 12 deletions priv/cabbage/.formatter.exs
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions priv/cabbage/.gitignore
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions priv/cabbage/Makefile
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions priv/cabbage/README.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion priv/cabbage/apps/itest/README.md
View file
Open in desktop

This file was deleted.

96 changes: 0 additions & 96 deletions priv/cabbage/apps/itest/lib/account.ex
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions priv/cabbage/apps/itest/lib/api_model/challenge_data.ex
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions priv/cabbage/apps/itest/lib/api_model/exit_data.ex
View file
Open in desktop

This file was deleted.

Loading