From fc42be2d0012651fbb60c3670b8697d63ce39e4a Mon Sep 17 00:00:00 2001 From: Ian O'Connor Date: Wed, 8 Apr 2026 16:09:13 -0400 Subject: [PATCH 1/4] Update resources index to resources-prod-2026-04-08 --- config/production.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/production.env b/config/production.env index 6811e45f..43da8308 100644 --- a/config/production.env +++ b/config/production.env @@ -1,5 +1,5 @@ ENCRYPTED_ELASTICSEARCH_URI=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAJYwgZMGCSqGSIb3DQEHBqCBhTCBggIBADB9BgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDFWw8ECX9Pz81z0kvAIBEIBQGec9PCpwuvEgLH6imhqP6tx1fj8Vlf2ZipnUy06jzmpE262Qvk9LPAq7sIYPVkTCZctwilwcU9oC6yxasVoUlK87la77v03CeZsPIDwciFY= -ENCRYPTED_RESOURCES_INDEX=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAHcwdQYJKoZIhvcNAQcGoGgwZgIBADBhBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDGOwQk67wE9nnptNhgIBEIA0olICpuUjppBGfOeFMWkmnElVd6qfJXPlgezZDu08t+rt4kQzWBuK7DALwhCeGNl45UpfGg== +ENCRYPTED_RESOURCES_INDEX=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAHcwdQYJKoZIhvcNAQcGoGgwZgIBADBhBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDAk2mOM+zTrPU2rOagIBEIA0E3OuraTI5i3rqAiNrAj4RKV/c6DqotQ5nqSP8TzKk0qZYlHz+1jua11ZtKHIJ9LhszaE4Q== ENCRYPTED_ELASTICSEARCH_API_KEY=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAJ4wgZsGCSqGSIb3DQEHBqCBjTCBigIBADCBhAYJKoZIhvcNAQcBMB4GCWCGSAFlAwQBLjARBAyPOPaQCBbvKQhJoPQCARCAV2TlWlRh+xKnCegpprEQgfldZGcVW48RND0LVd/pQpVTJnRTtbCpP7damT7k8ziJVdWZ3jsfs5fw5YnKc/EIQ1M//DRUzOJL98ir5LTTxE7QhflKDtUY+Q== ENCRYPTED_SCSB_URL=AQECAHh7ea2tyZ6phZgT4B9BDKwguhlFtRC6hgt+7HbmeFsrsgAAAHwwegYJKoZIhvcNAQcGoG0wawIBADBmBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDKPFC8wFkVM5CyT6VQIBEIA5m4eLBkpChRA//ZNEWsRqIDGZmevb/thzI03a0NiAW6VfybSAYpFthh+bj/yAk1VEEBF6r1T4A2GP From 45ebe0260e2247e3b364208b85f045d58b06e48f Mon Sep 17 00:00:00 2001 From: Vera Kahn Date: Thu, 9 Apr 2026 16:27:40 -0400 Subject: [PATCH 2/4] use wait for stable ecs --- .github/workflows/integration-tests.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index f9d5f765..e4485da8 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -1,9 +1,14 @@ -name: integration-test +name: Run Smoke Tests on: - pull_request: - branches: - - production + workflow_run: + workflows: ["Deploy to QA"] + types: + - completed + +permissions: + id-token: write + contents: read jobs: integration-test: @@ -17,6 +22,12 @@ jobs: with: role-to-assume: arn:aws:iam::946183545209:role/GithubActionsDeployerRole aws-region: us-east-1 + - name: Wait for stable service + uses: nick-fields/retry@v3 + with: + max_attempts: 3 + timeout_minutes: 10 + command: aws ecs wait services-stable --cluster collections-api-qa --services collections-api-qa - uses: actions/checkout@v3 - name: Set Node version uses: actions/setup-node@v3 From 5e872a7bb67e629def08f6755a2529a43c3a5005 Mon Sep 17 00:00:00 2001 From: Vera Kahn Date: Thu, 9 Apr 2026 16:28:56 -0400 Subject: [PATCH 3/4] replace service name --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index e4485da8..bbe65dd5 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -27,7 +27,7 @@ jobs: with: max_attempts: 3 timeout_minutes: 10 - command: aws ecs wait services-stable --cluster collections-api-qa --services collections-api-qa + command: aws ecs wait services-stable --cluster discovery-api-qa --services discovery-api-qa - uses: actions/checkout@v3 - name: Set Node version uses: actions/setup-node@v3 From 9cdb57046cffd2bcaede734cd5a4478948746643 Mon Sep 17 00:00:00 2001 From: Vera Kahn Date: Thu, 9 Apr 2026 16:32:05 -0400 Subject: [PATCH 4/4] generalize --- .github/workflows/integration-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index bbe65dd5..75205de5 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -2,7 +2,7 @@ name: Run Smoke Tests on: workflow_run: - workflows: ["Deploy to QA"] + workflows: ["Unit tests / deploy"] types: - completed @@ -27,7 +27,7 @@ jobs: with: max_attempts: 3 timeout_minutes: 10 - command: aws ecs wait services-stable --cluster discovery-api-qa --services discovery-api-qa + command: aws ecs wait services-stable --cluster discovery-api-${{github.ref_name}} --services discovery-api-${{github.ref_name}} - uses: actions/checkout@v3 - name: Set Node version uses: actions/setup-node@v3