Skip to content

Commit 75d1e2f

Browse files
committed
(ELI-466) adding a new test and changing to query the correct workflow
1 parent d3cfca2 commit 75d1e2f

File tree

5 files changed

+28
-6
lines changed

5 files changed

+28
-6
lines changed

.act/act_tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ act-preprod-deploy:
1717
-s GITHUB_TOKEN="$$GITHUB_TOKEN" \
1818
-s GH_TOKEN="$$GITHUB_TOKEN" \
1919
--env GITHUB_REPOSITORY="$$REPO" \
20-
--env PREPROD_WORKFLOW_ID=182365668 \
20+
--env TEST_WORKFLOW_ID=190123511 \
2121
--env GITHUB_EVENT_NAME=$(TRIGGER_TYPE)
2222

2323

.act/auto_preprod_trigger_latest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"status": "completed",
1313
"conclusion": "success",
1414
"head_branch": "main",
15-
"head_sha": "501e5c4c311a765800af527021ed4c6a707c3474"
15+
"head_sha": "166abc418e62d986484c8336f06223fc9135e864"
1616
},
1717
"repository": {
1818
"full_name": "NHSDigital/eligibility-signposting-api",
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"event_name": "workflow_run",
3+
"action": "completed",
4+
"workflow": {
5+
"name": "Test stage",
6+
"path": ".github/workflows/cicd-3-test-deploy.yaml"
7+
},
8+
"workflow_run": {
9+
"id": 18556637650,
10+
"name": "Test stage",
11+
"event": "push",
12+
"status": "completed",
13+
"conclusion": "success",
14+
"head_branch": "main",
15+
"head_sha": "60d567d18eb4916e931d4bdd4e15b9639ef1a0a0"
16+
},
17+
"repository": {
18+
"full_name": "NHSDigital/eligibility-signposting-api",
19+
"name": "eligibility-signposting-api",
20+
"owner": {"login": "NHSDigital"}
21+
}
22+
}

.github/workflows/cicd-4-preprod-deploy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
release_type: ${{ steps.release_type.outputs.release_type }}
3838

3939
env:
40-
PREPROD_WORKFLOW_ID: "182365668"
40+
TEST_WORKFLOW_ID: "190123511"
4141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4242
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4343

@@ -73,7 +73,7 @@ jobs:
7373
MANUAL_REF: ${{ github.event.inputs.ref }}
7474
WORKFLOW_NAME: "3. CD | Deploy to Test"
7575
BRANCH: "main"
76-
LIMIT: "30"
76+
LIMIT: "100"
7777
run: python3 scripts/workflow/pre-release_resolver.py
7878

7979
- name: Resolve release_type (labels → default rc)

scripts/workflow/pre-release_resolver.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
run
3232
)
3333

34-
WORKFLOW_ID = os.getenv("PREPROD_WORKFLOW_ID", "182365668")
35-
LIMIT = int(os.getenv("LIMIT", "30"))
34+
WORKFLOW_ID = os.getenv("TEST_WORKFLOW_ID", "190123511")
35+
LIMIT = int(os.getenv("LIMIT", "100"))
3636

3737
HEAD_SHA_AUTO = os.getenv("WORKFLOW_RUN_HEAD_SHA", "")
3838
MANUAL_REF = os.getenv("MANUAL_REF", "")

0 commit comments

Comments
 (0)