From 0f2e606c04b2725a2bd7dd2230217cedcf13ca7e Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 20 Nov 2020 20:22:20 +0300 Subject: [PATCH 01/10] add docker-compose for `test_docker_compose_release` --- .circleci/config.yml | 4 ++-- .gitmodules | 2 +- docker-compose.specs.yml | 10 ++++++++++ priv/cabbage | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 docker-compose.specs.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 8469ac4c64..c0269cbab8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -617,8 +617,8 @@ jobs: - run: name: Start daemon services command: | - cd priv/cabbage - make start_daemon_services-2 || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;) + SNAPSHOT=SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_120 make init_test + docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.specs.yml up || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;) - run: name: Log daemon services command: make cabbage-logs diff --git a/.gitmodules b/.gitmodules index ebb28fdad5..da37274aa4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "priv/cabbage"] path = priv/cabbage url = https://github.com/omgnetwork/specs.git - branch = master + branch = ayrat555/remove-docker-compose-files diff --git a/docker-compose.specs.yml b/docker-compose.specs.yml new file mode 100644 index 0000000000..d692c22c5a --- /dev/null +++ b/docker-compose.specs.yml @@ -0,0 +1,10 @@ +# this is an override to our usual docker-compose.yml which enables cabbage integration tests to run against a +# test-friendly setup of our services +version: "2.3" +services: + watcher: + environment: + - EXIT_PROCESSOR_SLA_MARGIN=30 + watcher_info: + environment: + - EXIT_PROCESSOR_SLA_MARGIN=30 diff --git a/priv/cabbage b/priv/cabbage index c127993c8d..5636480edf 160000 --- a/priv/cabbage +++ b/priv/cabbage @@ -1 +1 @@ -Subproject commit c127993c8d0d8cf93c10461e342917a9520ca8ab +Subproject commit 5636480edfed3705dcb3fb7c85d54d0497276dc7 From a507952e9b5a6baa3035b295ed38ac29f279b52d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 20 Nov 2020 20:29:09 +0300 Subject: [PATCH 02/10] run only reorg and release --- .circleci/config.yml | 254 +++++++++++++++++++++---------------------- 1 file changed, 127 insertions(+), 127 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0269cbab8..591532d497 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1040,135 +1040,135 @@ workflows: only: /.+/ tags: only: /.+/ - - test_barebone_release: - filters: *all_branches_and_tags - - notify_services: - requires: - - increase_chart_version_watcher_master - - increase_chart_version_watcher_info_master - filters: - branches: - only: - - master - - coveralls_report: - requires: - - watcher_coveralls_and_integration_tests - - watcher_info_coveralls_and_integration_tests - - common_coveralls_and_integration_tests - - test - - watcher_coveralls_and_integration_tests: - requires: [build] - filters: *all_branches_and_tags - - watcher_info_coveralls_and_integration_tests: - requires: [build] - filters: *all_branches_and_tags - - common_coveralls_and_integration_tests: - requires: [build] - filters: *all_branches_and_tags + # - test_barebone_release: + # filters: *all_branches_and_tags + # - notify_services: + # requires: + # - increase_chart_version_watcher_master + # - increase_chart_version_watcher_info_master + # filters: + # branches: + # only: + # - master + # - coveralls_report: + # requires: + # - watcher_coveralls_and_integration_tests + # - watcher_info_coveralls_and_integration_tests + # - common_coveralls_and_integration_tests + # - test + # - watcher_coveralls_and_integration_tests: + # requires: [build] + # filters: *all_branches_and_tags + # - watcher_info_coveralls_and_integration_tests: + # requires: [build] + # filters: *all_branches_and_tags + # - common_coveralls_and_integration_tests: + # requires: [build] + # filters: *all_branches_and_tags - test_docker_compose_release: filters: *all_branches_and_tags - - test_docker_compose_performance: - filters: *all_branches_and_tags + # - test_docker_compose_performance: + # filters: *all_branches_and_tags - test_docker_compose_reorg: filters: *all_branches_and_tags - - audit_deps: - requires: [build] - filters: *all_branches_and_tags - - lint: - requires: [build] - filters: *all_branches_and_tags - - lint_version: - requires: [build] - filters: *all_branches_and_tags - - sobelow: - requires: [build] - filters: *all_branches_and_tags - - dialyzer: - requires: [build] - filters: *all_branches_and_tags - - test: - requires: [build] - filters: *all_branches_and_tags - - property_tests: - requires: [build] - filters: *all_branches_and_tags - - watcher_mix_based_childchain: - filters: *all_branches_and_tags - - publish_watcher: - requires: - [ - test_barebone_release, - test_docker_compose_release, - watcher_coveralls_and_integration_tests, - watcher_info_coveralls_and_integration_tests, - common_coveralls_and_integration_tests, - test, - property_tests, - dialyzer, - lint, - lint_version, - audit_deps - ] - filters: &master_and_version_branches_and_all_tags - branches: - only: - - master - # vMAJOR.MINOR (e.g. v0.1, v0.2, v1.0, v2.1, etc.) - - /^v[0-9]+\.[0-9]+/ - tags: - only: - - /.+/ - - publish_watcher_info: - requires: - [ - test_barebone_release, - test_docker_compose_release, - watcher_coveralls_and_integration_tests, - watcher_info_coveralls_and_integration_tests, - common_coveralls_and_integration_tests, - test, - property_tests, - dialyzer, - lint, - lint_version, - audit_deps - ] - filters: *master_and_version_branches_and_all_tags + # - audit_deps: + # requires: [build] + # filters: *all_branches_and_tags + # - lint: + # requires: [build] + # filters: *all_branches_and_tags + # - lint_version: + # requires: [build] + # filters: *all_branches_and_tags + # - sobelow: + # requires: [build] + # filters: *all_branches_and_tags + # - dialyzer: + # requires: [build] + # filters: *all_branches_and_tags + # - test: + # requires: [build] + # filters: *all_branches_and_tags + # - property_tests: + # requires: [build] + # filters: *all_branches_and_tags + # - watcher_mix_based_childchain: + # filters: *all_branches_and_tags + # - publish_watcher: + # requires: + # [ + # test_barebone_release, + # test_docker_compose_release, + # watcher_coveralls_and_integration_tests, + # watcher_info_coveralls_and_integration_tests, + # common_coveralls_and_integration_tests, + # test, + # property_tests, + # dialyzer, + # lint, + # lint_version, + # audit_deps + # ] + # filters: &master_and_version_branches_and_all_tags + # branches: + # only: + # - master + # # vMAJOR.MINOR (e.g. v0.1, v0.2, v1.0, v2.1, etc.) + # - /^v[0-9]+\.[0-9]+/ + # tags: + # only: + # - /.+/ + # - publish_watcher_info: + # requires: + # [ + # test_barebone_release, + # test_docker_compose_release, + # watcher_coveralls_and_integration_tests, + # watcher_info_coveralls_and_integration_tests, + # common_coveralls_and_integration_tests, + # test, + # property_tests, + # dialyzer, + # lint, + # lint_version, + # audit_deps + # ] + # filters: *master_and_version_branches_and_all_tags - - publish_perf: - requires: [test_docker_compose_performance] - filters: - branches: - only: - - master - # vMAJOR.MINOR (e.g. v0.1, v0.2, v1.0, v2.1, etc.) - - /^v[0-9]+\.[0-9]+/ - tags: - only: - - /.+/ - # Increase chart version for master, this will end up trigger deployment on dev - - increase_chart_version_watcher_master: - requires: [publish_watcher, publish_watcher_info] - filters: - branches: - only: - - master - - increase_chart_version_watcher_info_master: - requires: [publish_watcher, publish_watcher_info] - filters: - branches: - only: - - master - # Increase chart version for new release - - increase_chart_version_watcher_release: - requires: [publish_watcher, publish_watcher_info] - filters: &only_release_tag - branches: - ignore: /.*/ - tags: - only: - # eg. v1.0.3-pre.0, v1.0.3, ... - - /^v[0-9]+\.[0-9]+\.[0-9]+.*/ - - increase_chart_version_watcher_info_release: - requires: [publish_watcher, publish_watcher_info] - filters: *only_release_tag + # - publish_perf: + # requires: [test_docker_compose_performance] + # filters: + # branches: + # only: + # - master + # # vMAJOR.MINOR (e.g. v0.1, v0.2, v1.0, v2.1, etc.) + # - /^v[0-9]+\.[0-9]+/ + # tags: + # only: + # - /.+/ + # # Increase chart version for master, this will end up trigger deployment on dev + # - increase_chart_version_watcher_master: + # requires: [publish_watcher, publish_watcher_info] + # filters: + # branches: + # only: + # - master + # - increase_chart_version_watcher_info_master: + # requires: [publish_watcher, publish_watcher_info] + # filters: + # branches: + # only: + # - master + # # Increase chart version for new release + # - increase_chart_version_watcher_release: + # requires: [publish_watcher, publish_watcher_info] + # filters: &only_release_tag + # branches: + # ignore: /.*/ + # tags: + # only: + # # eg. v1.0.3-pre.0, v1.0.3, ... + # - /^v[0-9]+\.[0-9]+\.[0-9]+.*/ + # - increase_chart_version_watcher_info_release: + # requires: [publish_watcher, publish_watcher_info] + # filters: *only_release_tag From 4747d19d1b45b19bc6436f09dfb06570c21228cd Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 20 Nov 2020 20:40:28 +0300 Subject: [PATCH 03/10] start docker-compose in background --- .circleci/config.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 591532d497..3e6555bd62 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -618,7 +618,7 @@ jobs: name: Start daemon services command: | SNAPSHOT=SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_120 make init_test - docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.specs.yml up || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;) + docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.specs.yml up -d || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;) - run: name: Log daemon services command: make cabbage-logs diff --git a/Makefile b/Makefile index f037727135..0f53fcdec9 100644 --- a/Makefile +++ b/Makefile @@ -354,7 +354,7 @@ docker-push: docker ### Cabbage logs cabbage-logs: - docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow + docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.specs.yml logs --follow cabbage-logs-reorg: docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f ./priv/cabbage/docker-compose-2-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow From 84b844abb12c81a5ff034bb1cc236aab5946b99d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 20 Nov 2020 20:53:23 +0300 Subject: [PATCH 04/10] copy env file --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e6555bd62..42b6209550 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -618,6 +618,7 @@ jobs: name: Start daemon services command: | SNAPSHOT=SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_120 make init_test + cp ./localchain_contract_addresses.env ./priv/cabbage/apps/itest/localchain_contract_addresses.env docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.specs.yml up -d || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;) - run: name: Log daemon services From fa124ef3666536d95151c04eabcabf4cd73c821d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 20 Nov 2020 21:18:41 +0300 Subject: [PATCH 05/10] fix reorg step --- .circleci/config.yml | 5 +-- docker-compose.reorg.yml | 67 ++++++++++++++++++++++++++++++++++++++++ nginx.reorg.conf | 39 +++++++++++++++++++++++ 3 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 docker-compose.reorg.yml create mode 100644 nginx.reorg.conf diff --git a/.circleci/config.yml b/.circleci/config.yml index 42b6209550..8a76466921 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -750,8 +750,9 @@ jobs: - run: name: Start daemon services command: | - cd priv/cabbage - make start_daemon_services_reorg-2 || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;) + make init_test_reorg + cp ./localchain_contract_addresses.env ./priv/cabbage/apps/itest/localchain_contract_addresses.env + docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.reorg.yml -f docker-compose.specs.yml up -d || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;) - run: name: Log daemon services command: make cabbage-logs-reorg diff --git a/docker-compose.reorg.yml b/docker-compose.reorg.yml new file mode 100644 index 0000000000..aea7add55b --- /dev/null +++ b/docker-compose.reorg.yml @@ -0,0 +1,67 @@ +version: "2.3" +services: + geth: + entrypoint: ["echo", "clique geth is disabled for reorgs"] + + geth-1: + image: ethereum/client-go:v1.9.12 + container_name: geth-1 + environment: + - ACCOUNT=0x6de4b3b9c28e9c3e84c2b2d3a875c947a84de68d + - BOOTNODES=enode://b655cc3e5b72ab9beb8a8536a3c3ae92fbeb79feb1ebd7f95d72be72554ca586428bd48a54eb9c2bcaae455cc674299b6dd3df3c6556a493dfd50070f1a448aa@172.27.0.202:30303 + - INIT=false + entrypoint: /bin/sh -c ". data/geth/command" + expose: + - 8545 + - 8546 + - 30303 + ports: + - 9000:8545 + volumes: + - ./data1:/data + - ./data/ethash:/root/.ethash + healthcheck: + test: curl geth-1:8545 + interval: 5s + timeout: 3s + retries: 5 + networks: + chain_net: + ipv4_address: 172.27.0.201 + + geth-2: + image: ethereum/client-go:v1.9.12 + container_name: geth-2 + depends_on: + - geth-1 + environment: + - ACCOUNT=0xc0f780dfc35075979b0def588d999225b7ecc56f + - BOOTNODES=enode://4574f825d67bf570b9216e704a5b761d05d5015c458e2c9dd4b30abb2fe8c881400c2074a126df94690c4c9fb72ee046e6e3ac2bb73dede42fce66cb0a963b36@172.27.0.201:30303 + - INIT=false + entrypoint: /bin/sh -c ". data/geth/command" + expose: + - 8546 + - 8545 + - 30303 + ports: + - 9001:8545 + volumes: + - ./data2:/data + - ./data/ethash:/root/.ethash + healthcheck: + test: curl geth-2:8545 + interval: 5s + timeout: 3s + retries: 5 + networks: + chain_net: + ipv4_address: 172.27.0.202 + + nginx: + depends_on: + geth-1: + condition: service_healthy + geth-2: + condition: service_healthy + volumes: + - ./nginx.reorg.conf:/etc/nginx/nginx.conf diff --git a/nginx.reorg.conf b/nginx.reorg.conf new file mode 100644 index 0000000000..21b779bae5 --- /dev/null +++ b/nginx.reorg.conf @@ -0,0 +1,39 @@ +events {} +http { + upstream geth { + server 172.27.0.201:8545; + server 172.27.0.202:8545; + } + + upstream websocket { + server 172.27.0.201:8546; + server 172.27.0.202:8546; + } + + server { + listen 80; + + location / { + proxy_pass http://geth; + proxy_next_upstream non_idempotent invalid_header error timeout http_500 http_502 http_504 http_403 http_404; + proxy_next_upstream_tries 4; + fastcgi_read_timeout 10; + proxy_read_timeout 10; + } + } + + server { + listen 81; + + location / { + proxy_pass http://websocket; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_next_upstream non_idempotent invalid_header error timeout http_500 http_502 http_504 http_403 http_404; + proxy_connect_timeout 7d; + proxy_send_timeout 7d; + proxy_read_timeout 7d; + } + } +} \ No newline at end of file From 5c05cecfdf6bb8cea779f70aad7caf259de0a7cb Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 20 Nov 2020 21:36:08 +0300 Subject: [PATCH 06/10] fix log commands --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 0f53fcdec9..c9d6f53b9a 100644 --- a/Makefile +++ b/Makefile @@ -357,24 +357,24 @@ cabbage-logs: docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.specs.yml logs --follow cabbage-logs-reorg: - docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f ./priv/cabbage/docker-compose-2-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow + docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.reorg.yml -f docker-compose.specs.yml logs --follow ### Cabbage reorg docker logs cabbage-reorg-watcher-logs: - docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-2-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow watcher + docker-compose -f docker-compose.yml -f docker-compose.reorg.yml -f docker-compose.specs.yml logs --follow watcher cabbage-reorg-watcher_info-logs: - docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-2-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow watcher_info + docker-compose -f docker-compose.yml -f docker-compose-2-reorg.yml -f docker-compose-2-specs.yml logs --follow watcher_info cabbage-reorg-childchain-logs: - docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-2-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow childchain + docker-compose -f docker-compose.yml -f docker-compose-2-reorg.yml -f docker-compose-2-specs.yml logs --follow childchain cabbage-reorg-geth-logs: - docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-2-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow | grep "geth" + docker-compose -f docker-compose.yml -f docker-compose-2-reorg.yml -f docker-compose-2-specs.yml logs --follow | grep "geth" cabbage-reorgs-logs: - docker-compose -f docker-compose.yml -f ./priv/cabbage/docker-compose-2-reorg.yml -f ./priv/cabbage/docker-compose-2-specs.yml logs --follow | grep "reorg" + docker-compose -f docker-compose.yml -f docker-compose-2-reorg.yml -f docker-compose-2-specs.yml logs --follow | grep "reorg" ###OTHER docker-start-cluster: From 6efa21b3cf3c299ee4ef677b839845a47e57c2c3 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 20 Nov 2020 21:36:38 +0300 Subject: [PATCH 07/10] uncomment steps --- .circleci/config.yml | 254 +++++++++++++++++++++---------------------- 1 file changed, 127 insertions(+), 127 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a76466921..8ff3fca139 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1042,135 +1042,135 @@ workflows: only: /.+/ tags: only: /.+/ - # - test_barebone_release: - # filters: *all_branches_and_tags - # - notify_services: - # requires: - # - increase_chart_version_watcher_master - # - increase_chart_version_watcher_info_master - # filters: - # branches: - # only: - # - master - # - coveralls_report: - # requires: - # - watcher_coveralls_and_integration_tests - # - watcher_info_coveralls_and_integration_tests - # - common_coveralls_and_integration_tests - # - test - # - watcher_coveralls_and_integration_tests: - # requires: [build] - # filters: *all_branches_and_tags - # - watcher_info_coveralls_and_integration_tests: - # requires: [build] - # filters: *all_branches_and_tags - # - common_coveralls_and_integration_tests: - # requires: [build] - # filters: *all_branches_and_tags + - test_barebone_release: + filters: *all_branches_and_tags + - notify_services: + requires: + - increase_chart_version_watcher_master + - increase_chart_version_watcher_info_master + filters: + branches: + only: + - master + - coveralls_report: + requires: + - watcher_coveralls_and_integration_tests + - watcher_info_coveralls_and_integration_tests + - common_coveralls_and_integration_tests + - test + - watcher_coveralls_and_integration_tests: + requires: [build] + filters: *all_branches_and_tags + - watcher_info_coveralls_and_integration_tests: + requires: [build] + filters: *all_branches_and_tags + - common_coveralls_and_integration_tests: + requires: [build] + filters: *all_branches_and_tags - test_docker_compose_release: filters: *all_branches_and_tags - # - test_docker_compose_performance: - # filters: *all_branches_and_tags + - test_docker_compose_performance: + filters: *all_branches_and_tags - test_docker_compose_reorg: filters: *all_branches_and_tags - # - audit_deps: - # requires: [build] - # filters: *all_branches_and_tags - # - lint: - # requires: [build] - # filters: *all_branches_and_tags - # - lint_version: - # requires: [build] - # filters: *all_branches_and_tags - # - sobelow: - # requires: [build] - # filters: *all_branches_and_tags - # - dialyzer: - # requires: [build] - # filters: *all_branches_and_tags - # - test: - # requires: [build] - # filters: *all_branches_and_tags - # - property_tests: - # requires: [build] - # filters: *all_branches_and_tags - # - watcher_mix_based_childchain: - # filters: *all_branches_and_tags - # - publish_watcher: - # requires: - # [ - # test_barebone_release, - # test_docker_compose_release, - # watcher_coveralls_and_integration_tests, - # watcher_info_coveralls_and_integration_tests, - # common_coveralls_and_integration_tests, - # test, - # property_tests, - # dialyzer, - # lint, - # lint_version, - # audit_deps - # ] - # filters: &master_and_version_branches_and_all_tags - # branches: - # only: - # - master - # # vMAJOR.MINOR (e.g. v0.1, v0.2, v1.0, v2.1, etc.) - # - /^v[0-9]+\.[0-9]+/ - # tags: - # only: - # - /.+/ - # - publish_watcher_info: - # requires: - # [ - # test_barebone_release, - # test_docker_compose_release, - # watcher_coveralls_and_integration_tests, - # watcher_info_coveralls_and_integration_tests, - # common_coveralls_and_integration_tests, - # test, - # property_tests, - # dialyzer, - # lint, - # lint_version, - # audit_deps - # ] - # filters: *master_and_version_branches_and_all_tags + - audit_deps: + requires: [build] + filters: *all_branches_and_tags + - lint: + requires: [build] + filters: *all_branches_and_tags + - lint_version: + requires: [build] + filters: *all_branches_and_tags + - sobelow: + requires: [build] + filters: *all_branches_and_tags + - dialyzer: + requires: [build] + filters: *all_branches_and_tags + - test: + requires: [build] + filters: *all_branches_and_tags + - property_tests: + requires: [build] + filters: *all_branches_and_tags + - watcher_mix_based_childchain: + filters: *all_branches_and_tags + - publish_watcher: + requires: + [ + test_barebone_release, + test_docker_compose_release, + watcher_coveralls_and_integration_tests, + watcher_info_coveralls_and_integration_tests, + common_coveralls_and_integration_tests, + test, + property_tests, + dialyzer, + lint, + lint_version, + audit_deps + ] + filters: &master_and_version_branches_and_all_tags + branches: + only: + - master + # vMAJOR.MINOR (e.g. v0.1, v0.2, v1.0, v2.1, etc.) + - /^v[0-9]+\.[0-9]+/ + tags: + only: + - /.+/ + - publish_watcher_info: + requires: + [ + test_barebone_release, + test_docker_compose_release, + watcher_coveralls_and_integration_tests, + watcher_info_coveralls_and_integration_tests, + common_coveralls_and_integration_tests, + test, + property_tests, + dialyzer, + lint, + lint_version, + audit_deps + ] + filters: *master_and_version_branches_and_all_tags - # - publish_perf: - # requires: [test_docker_compose_performance] - # filters: - # branches: - # only: - # - master - # # vMAJOR.MINOR (e.g. v0.1, v0.2, v1.0, v2.1, etc.) - # - /^v[0-9]+\.[0-9]+/ - # tags: - # only: - # - /.+/ - # # Increase chart version for master, this will end up trigger deployment on dev - # - increase_chart_version_watcher_master: - # requires: [publish_watcher, publish_watcher_info] - # filters: - # branches: - # only: - # - master - # - increase_chart_version_watcher_info_master: - # requires: [publish_watcher, publish_watcher_info] - # filters: - # branches: - # only: - # - master - # # Increase chart version for new release - # - increase_chart_version_watcher_release: - # requires: [publish_watcher, publish_watcher_info] - # filters: &only_release_tag - # branches: - # ignore: /.*/ - # tags: - # only: - # # eg. v1.0.3-pre.0, v1.0.3, ... - # - /^v[0-9]+\.[0-9]+\.[0-9]+.*/ - # - increase_chart_version_watcher_info_release: - # requires: [publish_watcher, publish_watcher_info] - # filters: *only_release_tag + - publish_perf: + requires: [test_docker_compose_performance] + filters: + branches: + only: + - master + # vMAJOR.MINOR (e.g. v0.1, v0.2, v1.0, v2.1, etc.) + - /^v[0-9]+\.[0-9]+/ + tags: + only: + - /.+/ + # Increase chart version for master, this will end up trigger deployment on dev + - increase_chart_version_watcher_master: + requires: [publish_watcher, publish_watcher_info] + filters: + branches: + only: + - master + - increase_chart_version_watcher_info_master: + requires: [publish_watcher, publish_watcher_info] + filters: + branches: + only: + - master + # Increase chart version for new release + - increase_chart_version_watcher_release: + requires: [publish_watcher, publish_watcher_info] + filters: &only_release_tag + branches: + ignore: /.*/ + tags: + only: + # eg. v1.0.3-pre.0, v1.0.3, ... + - /^v[0-9]+\.[0-9]+\.[0-9]+.*/ + - increase_chart_version_watcher_info_release: + requires: [publish_watcher, publish_watcher_info] + filters: *only_release_tag From 69c61a0d47db601052dddd439a4650ccf3bffca1 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Fri, 20 Nov 2020 22:32:21 +0300 Subject: [PATCH 08/10] fix file names --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c9d6f53b9a..3e8aeff2aa 100644 --- a/Makefile +++ b/Makefile @@ -365,16 +365,16 @@ cabbage-reorg-watcher-logs: docker-compose -f docker-compose.yml -f docker-compose.reorg.yml -f docker-compose.specs.yml logs --follow watcher cabbage-reorg-watcher_info-logs: - docker-compose -f docker-compose.yml -f docker-compose-2-reorg.yml -f docker-compose-2-specs.yml logs --follow watcher_info + docker-compose -f docker-compose.yml -f docker-compose.reorg.yml -f docker-compose.specs.yml logs --follow watcher_info cabbage-reorg-childchain-logs: - docker-compose -f docker-compose.yml -f docker-compose-2-reorg.yml -f docker-compose-2-specs.yml logs --follow childchain + docker-compose -f docker-compose.yml -f docker-compose.reorg.yml -f docker-compose.specs.yml logs --follow childchain cabbage-reorg-geth-logs: - docker-compose -f docker-compose.yml -f docker-compose-2-reorg.yml -f docker-compose-2-specs.yml logs --follow | grep "geth" + docker-compose -f docker-compose.yml -f docker-compose.reorg.yml -f docker-compose.specs.yml logs --follow | grep "geth" cabbage-reorgs-logs: - docker-compose -f docker-compose.yml -f docker-compose-2-reorg.yml -f docker-compose-2-specs.yml logs --follow | grep "reorg" + docker-compose -f docker-compose.yml -f docker-compose.reorg.yml -f docker-compose.specs.yml logs --follow | grep "reorg" ###OTHER docker-start-cluster: From c8033d9419de16cd3c60345731c1741c119c473c Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 23 Nov 2020 11:36:41 +0300 Subject: [PATCH 09/10] move snapshot to environment --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ff3fca139..a78daba655 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -600,6 +600,8 @@ jobs: test_docker_compose_release: machine: image: ubuntu-1604:201903-01 + environment: + SNAPSHOT: SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_120 parallelism: 4 steps: - checkout @@ -617,7 +619,7 @@ jobs: - run: name: Start daemon services command: | - SNAPSHOT=SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_120 make init_test + make init_test cp ./localchain_contract_addresses.env ./priv/cabbage/apps/itest/localchain_contract_addresses.env docker-compose -f docker-compose.yml -f docker-compose.feefeed.yml -f docker-compose.specs.yml up -d || (START_RESULT=$?; docker-compose logs; exit $START_RESULT;) - run: From e171c012efb37101fd8b44b25d515f6c14309ba7 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 23 Nov 2020 11:37:24 +0300 Subject: [PATCH 10/10] use master branch for specs --- .gitmodules | 2 +- priv/cabbage | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index da37274aa4..ebb28fdad5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "priv/cabbage"] path = priv/cabbage url = https://github.com/omgnetwork/specs.git - branch = ayrat555/remove-docker-compose-files + branch = master diff --git a/priv/cabbage b/priv/cabbage index 5636480edf..c2d4feef7a 160000 --- a/priv/cabbage +++ b/priv/cabbage @@ -1 +1 @@ -Subproject commit 5636480edfed3705dcb3fb7c85d54d0497276dc7 +Subproject commit c2d4feef7adce7b08daaab76dacf69ddc5fe86f6