From 6faf8b29a407cd8f087556d146f36ae92734109d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:22:35 -0700 Subject: [PATCH 1/4] chore(deps): update actions/checkout action to v4 (#1983) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/build_and_push_performance_test.yml | 4 ++-- .github/workflows/codeql.yml | 2 +- .github/workflows/docker.yaml | 2 +- .github/workflows/lambda_production.yml | 2 +- .github/workflows/lambda_staging.yml | 2 +- .github/workflows/performance.yml | 2 +- .github/workflows/s3-backup.yml | 2 +- .github/workflows/test.yaml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_and_push_performance_test.yml b/.github/workflows/build_and_push_performance_test.yml index ee19907222..75a666f2f2 100644 --- a/.github/workflows/build_and_push_performance_test.yml +++ b/.github/workflows/build_and_push_performance_test.yml @@ -20,7 +20,7 @@ jobs: images: ${{ steps.filter.outputs.changes }} steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 id: filter @@ -41,7 +41,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Build container run: | diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d62925099c..36669e3ef4 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Initialize CodeQL uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 317d1915a6..e5470da1c6 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest name: Build and push steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Install AWS CLI run: | curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" diff --git a/.github/workflows/lambda_production.yml b/.github/workflows/lambda_production.yml index c4f422e564..c1ca0aa1ed 100644 --- a/.github/workflows/lambda_production.yml +++ b/.github/workflows/lambda_production.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Configure AWS credentials id: aws-creds diff --git a/.github/workflows/lambda_staging.yml b/.github/workflows/lambda_staging.yml index ded54435df..48a72b2cd5 100644 --- a/.github/workflows/lambda_staging.yml +++ b/.github/workflows/lambda_staging.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Configure AWS credentials id: aws-creds diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 14a0034687..67d9475956 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -9,7 +9,7 @@ jobs: steps: - name: Install libcurl run: sudo apt-get update && sudo apt-get install libssl-dev libcurl4-openssl-dev - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Set up Python 3.10 uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0 with: diff --git a/.github/workflows/s3-backup.yml b/.github/workflows/s3-backup.yml index 71bf2105e4..17c7230470 100644 --- a/.github/workflows/s3-backup.yml +++ b/.github/workflows/s3-backup.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: fetch-depth: 0 # retrieve all history diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ad304f930f..b7249ced4e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -18,7 +18,7 @@ jobs: steps: - name: Install libcurl run: sudo apt-get update && sudo apt-get install libssl-dev libcurl4-openssl-dev - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Set up Python 3.10 uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0 with: From 5fcb7b3011fa40f3915b2d2f438286c1d3e3d0e6 Mon Sep 17 00:00:00 2001 From: Steve Astels Date: Wed, 20 Sep 2023 13:23:42 -0400 Subject: [PATCH 2/4] increase concurrency on staging sms celery pods (#1984) --- scripts/run_celery_send_sms.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run_celery_send_sms.sh b/scripts/run_celery_send_sms.sh index 1b8ea7de50..66abd8fac8 100755 --- a/scripts/run_celery_send_sms.sh +++ b/scripts/run_celery_send_sms.sh @@ -4,7 +4,7 @@ set -e -echo "Start celery, concurrency: ${CELERY_CONCURRENCY-4}" +echo "Start celery, concurrency: 6" # TODO: we shouldn't be using the send-sms-tasks queue anymore - once we verify this we can remove it -celery -A run_celery.notify_celery worker --pidfile="/tmp/celery.pid" --loglevel=INFO --concurrency=${CELERY_CONCURRENCY-4} -Q send-sms-tasks,send-sms-high,send-sms-medium,send-sms-low +celery -A run_celery.notify_celery worker --pidfile="/tmp/celery.pid" --loglevel=INFO --concurrency=6 -Q send-sms-tasks,send-sms-high,send-sms-medium,send-sms-low From f799a98f384ae8fe9a76395c0977e597ef42d300 Mon Sep 17 00:00:00 2001 From: Steve Astels Date: Wed, 20 Sep 2023 14:08:57 -0400 Subject: [PATCH 3/4] sms celery concurrency to 10 (#1985) --- scripts/run_celery_send_sms.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run_celery_send_sms.sh b/scripts/run_celery_send_sms.sh index 66abd8fac8..fc3686922c 100755 --- a/scripts/run_celery_send_sms.sh +++ b/scripts/run_celery_send_sms.sh @@ -4,7 +4,7 @@ set -e -echo "Start celery, concurrency: 6" +echo "Start celery, concurrency: 10" # TODO: we shouldn't be using the send-sms-tasks queue anymore - once we verify this we can remove it -celery -A run_celery.notify_celery worker --pidfile="/tmp/celery.pid" --loglevel=INFO --concurrency=6 -Q send-sms-tasks,send-sms-high,send-sms-medium,send-sms-low +celery -A run_celery.notify_celery worker --pidfile="/tmp/celery.pid" --loglevel=INFO --concurrency=10 -Q send-sms-tasks,send-sms-high,send-sms-medium,send-sms-low From 8f919be056e1de916650525dae44e1d4c4024263 Mon Sep 17 00:00:00 2001 From: Steve Astels Date: Wed, 20 Sep 2023 15:53:51 -0400 Subject: [PATCH 4/4] back to 4 concurrency for sms send (#1986) --- scripts/run_celery_send_sms.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run_celery_send_sms.sh b/scripts/run_celery_send_sms.sh index fc3686922c..1b8ea7de50 100755 --- a/scripts/run_celery_send_sms.sh +++ b/scripts/run_celery_send_sms.sh @@ -4,7 +4,7 @@ set -e -echo "Start celery, concurrency: 10" +echo "Start celery, concurrency: ${CELERY_CONCURRENCY-4}" # TODO: we shouldn't be using the send-sms-tasks queue anymore - once we verify this we can remove it -celery -A run_celery.notify_celery worker --pidfile="/tmp/celery.pid" --loglevel=INFO --concurrency=10 -Q send-sms-tasks,send-sms-high,send-sms-medium,send-sms-low +celery -A run_celery.notify_celery worker --pidfile="/tmp/celery.pid" --loglevel=INFO --concurrency=${CELERY_CONCURRENCY-4} -Q send-sms-tasks,send-sms-high,send-sms-medium,send-sms-low