From a6e684078472f023098a30d440167761e8aa016f Mon Sep 17 00:00:00 2001 From: fdbk <fdbk@riseup.net> Date: Fri, 30 Oct 2020 12:08:47 -0400 Subject: [PATCH] [fdbk] Remove sms_codes service. --- bin/load/run | 2 +- docker-compose-test-load.yml | 11 ----------- simulator/signal.js | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/bin/load/run b/bin/load/run index a6fa9b61..76db988c 100755 --- a/bin/load/run +++ b/bin/load/run @@ -45,7 +45,7 @@ docker-compose -f docker-compose-test-load.yml run --entrypoint /signalboost/bin ### RUN SERVICES echo "--- running load test..." -docker-compose -f docker-compose-test-load.yml up -d signal_server redis ngrok_simulator signal_sms_codes signalboost_ngrok app simulator +docker-compose -f docker-compose-test-load.yml up -d signal_server redis ngrok_simulator signalboost_ngrok app simulator check-until-ngrok-url-available echo "NGROK URL: $host_url" diff --git a/docker-compose-test-load.yml b/docker-compose-test-load.yml index a81b5016..2a411ce3 100644 --- a/docker-compose-test-load.yml +++ b/docker-compose-test-load.yml @@ -59,7 +59,6 @@ services: container_name: load_test_app depends_on: - db - - signald_app entrypoint: /signalboost/bin/entrypoint/app env_file: .env.dev environment: @@ -106,7 +105,6 @@ services: container_name: load_test_simulator depends_on: - db - - signald_simulator entrypoint: /signalboost/bin/entrypoint/simulator env_file: .env.dev expose: @@ -142,15 +140,6 @@ services: - "6379:6379" restart: always - signal_sms_codes: - image: registry.gitlab.com/signald/test-infrastructure/test-helper:master - container_name: load_test_signal_sms_codes - restart: always - environment: - DB: "host=db user=signal dbname=signal password=password sslmode=disable" - ports: - - "127.0.0.1:8082:8082" - # prefer ngrok_signalboost, need to change url to ngrok in app entrypoint signalboost_ngrok: container_name: load_test_app_signalboost_ngrok diff --git a/simulator/signal.js b/simulator/signal.js index d7faabab..856d3bb6 100644 --- a/simulator/signal.js +++ b/simulator/signal.js @@ -44,7 +44,7 @@ const register = async (phoneNumber, captchaToken, dbPool) => { ...(captchaToken ? { captcha: captchaToken } : {}), }) - await util.wait(10000) + await util.wait(1000) logger.log(`${phoneNumber}: Verifying...`) await verify(phoneNumber, dbPool) -- GitLab