Skip to content

Commit e206407

Browse files
nsindhu26JackPlowmanCorbiscmabe13mik3ola
authored
Release/27.1 (#1039)
# Release Branch Pull Request ## Description of Changes Release includes changes to accept Distance Selling Pharmacies and some PEN test fixes Additional has a release pipeline fix and integration test amendments --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Jack Plowman <62281988+JackPlowman@users.noreply.github.com> Co-authored-by: Corbisc <95412908+Corbisc@users.noreply.github.com> Co-authored-by: Matthew Begley <60427904+mabe13@users.noreply.github.com> Co-authored-by: mabe13 <matthewbegley@nhs.net> Co-authored-by: Michael Olaw <michael.olaw1@nhs.net> Co-authored-by: Jack Plowman <jack.plowman1@nhs.net> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vamsi Jonnagadda <vamsijonnagadda@ICTs-MacBook-Pro.local> Co-authored-by: vkjonnagadda <32249251+vkjonnagadda@users.noreply.github.com> Co-authored-by: Thomas Judd-Cooper <me@tomjuddcooper.co.uk> Co-authored-by: Sindhu <nsindhu26@gmail.com> Co-authored-by: ThomasC-Kainos <106971950+ThomasC-Kainos@users.noreply.github.com> Co-authored-by: ManithaSrinivasa <manitha.srinivasa@accenture.com> Co-authored-by: ajmu1 <ajay.mudgal1@nhs.net>
1 parent 7442128 commit e206407

4 files changed

Lines changed: 18 additions & 20 deletions

File tree

infrastructure/stacks/development-and-deployment-tools/buildspecs/build-arm-image-in-pipeline-buildspec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
version: 0.2
33

44
phases:
5-
pre_build:
5+
install:
66
commands:
77
- mkdir -p $HOME/.docker/cli-plugins
88
- wget -O $HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm64
@@ -15,8 +15,8 @@ phases:
1515
- docker run --privileged --rm tonistiigi/binfmt --install all
1616
- export DOCKER_BUILDKIT=1
1717
- export DOCKER_CLI_EXPERIMENTAL=enabled
18-
- docker buildx create --name mybuilder --use
1918
- docker buildx version
19+
- docker buildx create --name mybuilder --use
2020
build:
2121
commands:
2222
- echo "[Building docker containers]"

infrastructure/stacks/development-and-deployment-tools/pipeline_stages.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ resource "aws_codebuild_project" "build_image_stage" {
6565

6666
environment {
6767
compute_type = "BUILD_GENERAL1_SMALL"
68-
image = "aws/codebuild/amazonlinux2-x86_64-standard:5.0"
69-
type = "LINUX_CONTAINER"
68+
image = "aws/codebuild/amazonlinux2-aarch64-standard:3.0"
69+
type = "ARM_CONTAINER"
7070
image_pull_credentials_type = "CODEBUILD"
7171
privileged_mode = true
7272

project.code-workspace

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,10 @@
192192
"titleBar.activeForeground": "#15202b",
193193
"titleBar.inactiveBackground": "#f9e64f99",
194194
"titleBar.inactiveForeground": "#15202b99",
195-
"editorGroup.border": "#fbed80",
196-
"panel.border": "#fbed80",
197195
"sash.hoverBorder": "#fbed80",
198-
"sideBar.border": "#fbed80",
199196
"statusBarItem.remoteBackground": "#f9e64f",
200-
"statusBarItem.remoteForeground": "#15202b"
197+
"statusBarItem.remoteForeground": "#15202b",
198+
"commandCenter.border": "#15202b99"
201199
},
202200
"peacock.color": "#f9e64f"
203201
}

test/integration/features/F006_Opening_Times.feature

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ Feature: F006. Opening times
3333
@complete @opening_times
3434
Scenario: F006SXX6. Confirm recently added specified opening date can be removed from Dos
3535
Given a basic service is created
36-
And the change event is "open" on date "Jan 01 2025"
36+
And the change event is "open" on date "Jan 01 2026"
3737
When the Changed Event is sent for processing with "valid" api key
38-
Then DoS is open on "Jan 01 2025"
38+
Then DoS is open on "Jan 01 2026"
3939
Given the change event has no specified opening dates
4040
When the Changed Event is sent for processing with "valid" api key
41-
Then there is no longer a specified opening on "Jan 01 2025"
41+
Then there is no longer a specified opening on "Jan 01 2026"
4242
And the service history is updated with the "removed" specified opening times
4343

4444
@complete @opening_times
@@ -55,29 +55,29 @@ Feature: F006. Opening times
5555
@complete @opening_times
5656
Scenario: F006SX8. Additional date changes open to closed
5757
Given an entry is created in the services table
58-
And the service is "open" on date "Jan 01 2025"
58+
And the service is "open" on date "Jan 01 2026"
5959
And the entry is committed to the services table
60-
And the change event is "closed" on date "Jan 01 2025"
60+
And the change event is "closed" on date "Jan 01 2026"
6161
When the Changed Event is sent for processing with "valid" api key
62-
Then DoS is closed on "Jan 01 2025"
62+
Then DoS is closed on "Jan 01 2026"
6363

6464
@complete @opening_times
6565
Scenario: F006SX9. Additional date changes closed to open
6666
Given an entry is created in the services table
67-
And the service is "closed" on date "Jan 01 2025"
67+
And the service is "closed" on date "Jan 01 2026"
6868
And the entry is committed to the services table
69-
And the change event is "open" on date "Jan 01 2025"
69+
And the change event is "open" on date "Jan 01 2026"
7070
When the Changed Event is sent for processing with "valid" api key
71-
Then DoS is open on "Jan 01 2025"
71+
Then DoS is open on "Jan 01 2026"
7272

7373
@complete @opening_times
7474
Scenario: F006SX10. Additional date changes times changed
7575
Given an entry is created in the services table
76-
And the service is "open" on date "Jan 01 2025"
76+
And the service is "open" on date "Jan 01 2026"
7777
And the entry is committed to the services table
78-
And the change event specified opening is "open" from "10:00" to "16:00" on date "Jan 01 2025"
78+
And the change event specified opening is "open" from "10:00" to "16:00" on date "Jan 01 2026"
7979
When the Changed Event is sent for processing with "valid" api key
80-
Then DoS is open from "10:00" until "16:00" on "Jan 01 2025"
80+
Then DoS is open from "10:00" until "16:00" on "Jan 01 2026"
8181
And the "service-sync" lambda does not show "report_key" with value "BLANK_STANDARD_OPENINGS"
8282

8383
@complete @opening_times

0 commit comments

Comments
 (0)