From 1c133cbefa85773b17b163aa5862a246b64444d2 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 3 Nov 2020 16:25:00 +0300 Subject: [PATCH 01/11] add perf cli smoke test This PR adds ci step that runs `transactions` perf test --- .circleci/config.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index cbf4632cb1..2795169ff7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -880,6 +880,22 @@ jobs: - run: make docker-perf IMAGE_NAME=$PERF_IMAGE_NAME - run: IMAGE_NAME=$PERF_IMAGE_NAME sh .circleci/ci_publish.sh + run_perf_cli_smoke_test: + machine: + image: ubuntu-1604:201903-01 + environment: + PERF_IMAGE_NAME: "omisego/perf:ci" + steps: + - checkout + - docker_login + - run: + name: Start geth, postgres, feefeed and pull in blockchain snapshot + command: make start-services + background: true + - run: make docker-perf IMAGE_NAME=$PERF_IMAGE_NAME + - run: docker run -it $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- help + - run: docker run -it $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- "transactions" 10 10 + publish_watcher_info: machine: image: ubuntu-1604:201903-01 From 2476aa7a5e6c3d67e307906c7d833bdc90a80c44 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 3 Nov 2020 16:28:19 +0300 Subject: [PATCH 02/11] comment all steps --- .circleci/config.yml | 274 ++++++++++++++++++++++--------------------- 1 file changed, 138 insertions(+), 136 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2795169ff7..f684f57ce4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1025,141 +1025,143 @@ workflows: - test_barebone_release build-test-deploy: jobs: - - build: - filters: &all_branches_and_tags - branches: - 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_docker_compose_release: - 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] + # - build: + # filters: &all_branches_and_tags + # branches: + # 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_docker_compose_release: + # 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 + - run_perf_cli_smoke_test 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_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 885b170dfd7b64df98dfbb8a6e929c55c1709893 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 3 Nov 2020 16:33:20 +0300 Subject: [PATCH 03/11] uncomment build step --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f684f57ce4..2d2a257ef6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1025,12 +1025,12 @@ workflows: - test_barebone_release build-test-deploy: jobs: - # - build: - # filters: &all_branches_and_tags - # branches: - # only: /.+/ - # tags: - # only: /.+/ + - build: + filters: &all_branches_and_tags + branches: + only: /.+/ + tags: + only: /.+/ # - test_barebone_release: # filters: *all_branches_and_tags # - notify_services: @@ -1085,7 +1085,7 @@ workflows: # filters: *all_branches_and_tags # - watcher_mix_based_childchain: # filters: *all_branches_and_tags - - run_perf_cli_smoke_test + - run_perf_cli_smoke_test: filters: *all_branches_and_tags # - publish_watcher: # requires: From bba8d98d2d26dc6ffe9a30cedb276a62706a1419 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 3 Nov 2020 16:40:30 +0300 Subject: [PATCH 04/11] export env vars --- .circleci/config.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2d2a257ef6..f66b7be6bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -889,12 +889,16 @@ jobs: - checkout - docker_login - run: - name: Start geth, postgres, feefeed and pull in blockchain snapshot - command: make start-services - background: true + name: Start daemon services + command: | + cd priv/perf + make start-services - run: make docker-perf IMAGE_NAME=$PERF_IMAGE_NAME - run: docker run -it $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- help - - run: docker run -it $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- "transactions" 10 10 + - run: + command: | + export $(cat ./localchain_contract_addresses.env | xargs) && + docker run -it $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- "transactions" 10 10 publish_watcher_info: machine: From 124b668168e26295535b8844590de100ea8c898a Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 3 Nov 2020 16:46:04 +0300 Subject: [PATCH 05/11] setup datadir --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f66b7be6bd..98840d7602 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -888,6 +888,10 @@ jobs: steps: - checkout - docker_login + - run: + name: Setup data dir + command: | + [ -d data ] || mkdir data && chmod 777 data - run: name: Start daemon services command: | From 90a591d6639306f9bcb642cf759b12116d1e0fe0 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 3 Nov 2020 16:50:06 +0300 Subject: [PATCH 06/11] make docker images --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 98840d7602..1da2eddae7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -888,6 +888,7 @@ jobs: steps: - checkout - docker_login + - make_docker_images - run: name: Setup data dir command: | From 48fa6925c699ea8933b57a4c574732d8a5651781 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 3 Nov 2020 18:00:11 +0300 Subject: [PATCH 07/11] use host network --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1da2eddae7..92d46c1b3e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -903,7 +903,7 @@ jobs: - run: command: | export $(cat ./localchain_contract_addresses.env | xargs) && - docker run -it $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- "transactions" 10 10 + docker run -it --env-file ./localchain_contract_addresses.env --network host $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- "deposits" 10 10 publish_watcher_info: machine: From 4ee5857447db0e44a4b6c70663d41ab015d0d902 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 3 Nov 2020 18:03:48 +0300 Subject: [PATCH 08/11] uncomment ci steps --- .circleci/config.yml | 262 +++++++++++++++++++++---------------------- 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 92d46c1b3e..9103154de3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1040,137 +1040,137 @@ 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_docker_compose_release: - # 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 + - 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_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 - run_perf_cli_smoke_test: 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_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 a85030d7428e74fa7cf10da8dbb2a06aeb356363 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Wed, 4 Nov 2020 18:09:32 +0300 Subject: [PATCH 09/11] add commands under `test_docker_compose_performance` --- .circleci/config.yml | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9103154de3..3dbb2cfcb4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -657,6 +657,8 @@ jobs: description: "These are not actually performance tests, we're checking if the scripts work" machine: image: ubuntu-1604:201903-01 + environment: + PERF_IMAGE_NAME: "omisego/perf:latest" steps: - checkout - run: @@ -685,6 +687,17 @@ jobs: make init export $(cat ../../localchain_contract_addresses.env | xargs) make test + - run: + name: Build perf docker image + command: make docker-perf IMAGE_NAME=$PERF_IMAGE_NAME + - run: + name: Show help information + command: docker run -it $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- help + - run: + name: Run perf smoke test + command: | + export $(cat ./localchain_contract_addresses.env | xargs) && + docker run -it --env-file ./localchain_contract_addresses.env --network host $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- "deposits" 10 10 - run: name: (Perf) Format generated code and check for warnings command: | @@ -880,31 +893,6 @@ jobs: - run: make docker-perf IMAGE_NAME=$PERF_IMAGE_NAME - run: IMAGE_NAME=$PERF_IMAGE_NAME sh .circleci/ci_publish.sh - run_perf_cli_smoke_test: - machine: - image: ubuntu-1604:201903-01 - environment: - PERF_IMAGE_NAME: "omisego/perf:ci" - steps: - - checkout - - docker_login - - make_docker_images - - run: - name: Setup data dir - command: | - [ -d data ] || mkdir data && chmod 777 data - - run: - name: Start daemon services - command: | - cd priv/perf - make start-services - - run: make docker-perf IMAGE_NAME=$PERF_IMAGE_NAME - - run: docker run -it $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- help - - run: - command: | - export $(cat ./localchain_contract_addresses.env | xargs) && - docker run -it --env-file ./localchain_contract_addresses.env --network host $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- "deposits" 10 10 - publish_watcher_info: machine: image: ubuntu-1604:201903-01 From 99ec938f72f8e0edc4e924f409fb9942bf2eee9e Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Thu, 5 Nov 2020 11:52:28 +0300 Subject: [PATCH 10/11] remove step --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3dbb2cfcb4..c052011f5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1082,8 +1082,6 @@ workflows: filters: *all_branches_and_tags - watcher_mix_based_childchain: filters: *all_branches_and_tags - - run_perf_cli_smoke_test: - filters: *all_branches_and_tags - publish_watcher: requires: [ From f4278431e33ebd9d1d13efa35faa6e22875add62 Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 10 Nov 2020 17:42:32 +0300 Subject: [PATCH 11/11] change order of commands --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c052011f5b..9af83b7cf4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -667,6 +667,9 @@ jobs: [ -d data ] || mkdir data && chmod 777 data - docker_login - make_docker_images + - run: + name: Build perf docker image + command: make docker-perf IMAGE_NAME=$PERF_IMAGE_NAME - run: name: Start daemon services command: | @@ -687,9 +690,6 @@ jobs: make init export $(cat ../../localchain_contract_addresses.env | xargs) make test - - run: - name: Build perf docker image - command: make docker-perf IMAGE_NAME=$PERF_IMAGE_NAME - run: name: Show help information command: docker run -it $PERF_IMAGE_NAME mix run -e "LoadTest.TestRunner.run()" -- help