From 42a5436bee51b4f2bf274cb07deaad473ee1ae8b Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Thu, 23 Apr 2026 09:31:14 +0100 Subject: [PATCH 1/7] Chore: [ELI-811] - Added run-nbs-int-tests job for NBS integration tests in preprod --- .github/workflows/nbs-int-tests.yml | 58 +++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/nbs-int-tests.yml diff --git a/.github/workflows/nbs-int-tests.yml b/.github/workflows/nbs-int-tests.yml new file mode 100644 index 0000000..24da58e --- /dev/null +++ b/.github/workflows/nbs-int-tests.yml @@ -0,0 +1,58 @@ +name: NBS Int Tests + +on: + workflow_dispatch: + +jobs: + run-nbs-int-tests: + permissions: + id-token: write + contents: read + runs-on: ubuntu-22.04 + environment: preprod + + steps: + - name: Checkout main + uses: actions/checkout@v4 + with: + ref: main + + - name: Install asdf + uses: asdf-vm/actions/setup@v3 + with: + asdf_version: v0.18.0 + + - name: Cache asdf + uses: actions/cache@v4 + with: + path: | + ~/.asdf + key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }} + + - name: Install asdf dependencies + uses: asdf-vm/actions/install@v3 + with: + asdf_version: v0.18.0 + env: + PYTHON_CONFIGURE_OPTS: --enable-shared + + - name: Cache Virtualenv + id: cache-venv + uses: actions/cache@v4 + with: + path: | + .venv + key: ${{ runner.os }}-venv-${{ hashFiles('pyproject.toml') }} + + - name: Install Dependencies + if: steps.cache-venv.outputs.cache-hit != 'true' + run: make install + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v5 + with: + role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/Eligibility-Signposting-API-E2E-Regression-Tests + aws-region: eu-west-2 + + - name: Run NBS Integration Tests + run: make run-nbs-preprod-tests From b7e67eb15f0f8ef244664d05c0a01570bd95ab69 Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Thu, 23 Apr 2026 11:40:10 +0100 Subject: [PATCH 2/7] Chore: [ELI-811] - Fixed the failing asdf installation step --- .github/workflows/nbs-int-tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nbs-int-tests.yml b/.github/workflows/nbs-int-tests.yml index 24da58e..028bea3 100644 --- a/.github/workflows/nbs-int-tests.yml +++ b/.github/workflows/nbs-int-tests.yml @@ -13,24 +13,24 @@ jobs: steps: - name: Checkout main - uses: actions/checkout@v4 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 with: ref: main - name: Install asdf - uses: asdf-vm/actions/setup@v3 + uses: asdf-vm/actions/setup@4f8f7939dd917fc656bb7c3575969a5988c28364 with: asdf_version: v0.18.0 - name: Cache asdf - uses: actions/cache@v4 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: | ~/.asdf key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }} - name: Install asdf dependencies - uses: asdf-vm/actions/install@v3 + uses: asdf-vm/actions/install@4f8f7939dd917fc656bb7c3575969a5988c28364 with: asdf_version: v0.18.0 env: @@ -38,7 +38,7 @@ jobs: - name: Cache Virtualenv id: cache-venv - uses: actions/cache@v4 + uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 with: path: | .venv @@ -49,7 +49,7 @@ jobs: run: make install - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v5 + uses: aws-actions/configure-aws-credentials@a7f0c828ac76e0d049e34c920172c60f579f9eb3 with: role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/Eligibility-Signposting-API-E2E-Regression-Tests aws-region: eu-west-2 From 4ed20634853dc43aea7e9dfe5c48844734ff6894 Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Sun, 26 Apr 2026 13:26:03 +0100 Subject: [PATCH 3/7] Chore: [ELI-811] - Fixed the deprecated dependency --- .github/workflows/nbs-int-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nbs-int-tests.yml b/.github/workflows/nbs-int-tests.yml index 028bea3..d2ca06b 100644 --- a/.github/workflows/nbs-int-tests.yml +++ b/.github/workflows/nbs-int-tests.yml @@ -1,4 +1,4 @@ -name: NBS Int Tests +name: Repopulate NBS Preprod Data on: workflow_dispatch: @@ -23,7 +23,7 @@ jobs: asdf_version: v0.18.0 - name: Cache asdf - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: | ~/.asdf From 8d9f6bed956d7f303f38dc4c716b94d92733a25e Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Sun, 26 Apr 2026 13:38:31 +0100 Subject: [PATCH 4/7] Chore: [ELI-811] - Updated AWS secrets --- .github/workflows/nbs-int-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nbs-int-tests.yml b/.github/workflows/nbs-int-tests.yml index d2ca06b..69f51fe 100644 --- a/.github/workflows/nbs-int-tests.yml +++ b/.github/workflows/nbs-int-tests.yml @@ -51,7 +51,7 @@ jobs: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@a7f0c828ac76e0d049e34c920172c60f579f9eb3 with: - role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/Eligibility-Signposting-API-E2E-Regression-Tests + role-to-assume: arn:aws:iam::${{ secrets.ELID_PREPROD_AWS_ACCOUNT_ID }}:role/Eligibility-Signposting-API-E2E-Regression-Tests aws-region: eu-west-2 - name: Run NBS Integration Tests From 11f8c6ccf9ca08759de0cbd3a5665f12485c6e6c Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Sun, 26 Apr 2026 14:15:16 +0100 Subject: [PATCH 5/7] Chore: [ELI-811] - Updated actions/cache --- .github/workflows/nbs-int-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nbs-int-tests.yml b/.github/workflows/nbs-int-tests.yml index 69f51fe..87a0602 100644 --- a/.github/workflows/nbs-int-tests.yml +++ b/.github/workflows/nbs-int-tests.yml @@ -38,7 +38,7 @@ jobs: - name: Cache Virtualenv id: cache-venv - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: | .venv From e7f69c4942fc35125f68522543afd98dd7b4704d Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Sun, 26 Apr 2026 14:27:59 +0100 Subject: [PATCH 6/7] Chore: [ELI-811] - Updated actions/cache --- .github/workflows/nbs-int-tests.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/nbs-int-tests.yml b/.github/workflows/nbs-int-tests.yml index 87a0602..3968894 100644 --- a/.github/workflows/nbs-int-tests.yml +++ b/.github/workflows/nbs-int-tests.yml @@ -13,43 +13,42 @@ jobs: steps: - name: Checkout main - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd with: ref: main - name: Install asdf - uses: asdf-vm/actions/setup@4f8f7939dd917fc656bb7c3575969a5988c28364 + uses: asdf-vm/actions/setup@b7bcd026f18772e44fe1026d729e1611cc435d47 with: - asdf_version: v0.18.0 + asdf_version: 0.18.0 - name: Cache asdf - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 + uses: actions/cache@v5 with: path: | ~/.asdf key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }} - - name: Install asdf dependencies - uses: asdf-vm/actions/install@4f8f7939dd917fc656bb7c3575969a5988c28364 + - name: Install asdf dependencies in .tool-versions + uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47 with: - asdf_version: v0.18.0 + asdf_version: 0.18.0 env: PYTHON_CONFIGURE_OPTS: --enable-shared - name: Cache Virtualenv id: cache-venv - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 + uses: actions/cache@v5 with: - path: | - .venv + path: .venv key: ${{ runner.os }}-venv-${{ hashFiles('pyproject.toml') }} - name: Install Dependencies if: steps.cache-venv.outputs.cache-hit != 'true' - run: make install + run: make install-python - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@a7f0c828ac76e0d049e34c920172c60f579f9eb3 + uses: aws-actions/configure-aws-credentials@v6.1.0 with: role-to-assume: arn:aws:iam::${{ secrets.ELID_PREPROD_AWS_ACCOUNT_ID }}:role/Eligibility-Signposting-API-E2E-Regression-Tests aws-region: eu-west-2 From 32376fda135e113ba10b9231fb5e403303308f42 Mon Sep 17 00:00:00 2001 From: Feyisayo Afolabi Date: Sun, 26 Apr 2026 14:41:51 +0100 Subject: [PATCH 7/7] Chore: [ELI-811] - Updated SHA for aws --- .github/workflows/nbs-int-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nbs-int-tests.yml b/.github/workflows/nbs-int-tests.yml index 3968894..1b93ff2 100644 --- a/.github/workflows/nbs-int-tests.yml +++ b/.github/workflows/nbs-int-tests.yml @@ -48,7 +48,7 @@ jobs: run: make install-python - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v6.1.0 + uses: aws-actions/configure-aws-credentials@a7f0c828ac76e0d049e34c920172c60f579f9eb3 with: role-to-assume: arn:aws:iam::${{ secrets.ELID_PREPROD_AWS_ACCOUNT_ID }}:role/Eligibility-Signposting-API-E2E-Regression-Tests aws-region: eu-west-2