Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to use latest SNOMED CT Major Release 39.0.0 #848

Merged
merged 1 commit into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ pipeline {
source docker/vars.local.tests.sh
docker-compose -f docker/docker-compose.yml up -d ps_db
docker-compose -f docker/docker-compose.yml up db_migration
aws s3 cp s3://snomed-schema/uk_sct2mo_38.2.0_20240605000001Z.zip ./snomed-database-loader/uk_sct2mo_38.2.0_20240605000001Z.zip
aws s3 cp s3://snomed-schema/uk_sct2mo_39.0.0_20240925000001Z.zip ./snomed-database-loader/uk_sct2mo_39.0.0_20240925000001Z.zip
# As Jenkins is running inside of Docker too, can't just reference the snomed file as a volume as part of the docker run command
# Instead copy the file into a named volume first as a separate docker command
docker volume create --name snomed
cat ./snomed-database-loader/uk_sct2mo_38.2.0_20240605000001Z.zip | docker run --rm --interactive -v snomed:/snomed alpine sh -c "cat > /snomed/uk_sct2mo_38.2.0_20240605000001Z.zip"
docker-compose -f docker/docker-compose.yml run --rm --volume snomed:/snomed snomed_schema /snomed/uk_sct2mo_38.2.0_20240605000001Z.zip
cat ./snomed-database-loader/uk_sct2mo_39.0.0_20240925000001Z.zip | docker run --rm --interactive -v snomed:/snomed alpine sh -c "cat > /snomed/uk_sct2mo_39.0.0_20240925000001Z.zip"
docker-compose -f docker/docker-compose.yml run --rm --volume snomed:/snomed snomed_schema /snomed/uk_sct2mo_39.0.0_20240925000001Z.zip
docker volume rm snomed
'''
}
Expand Down Expand Up @@ -206,7 +206,7 @@ pipeline {
always {
sh label: 'Remove exited containers', script: 'docker container prune --force'
sh label: 'Remove images tagged with current BUILD_TAG', script: 'docker image rm -f $(docker images "*/*:*${BUILD_TAG}" -q) $(docker images "*/*/*:*${BUILD_TAG}" -q) || true'
sh label: 'Delete Snomed CT database zip', script: 'rm ./snomed-database-loader/uk_sct2mo_38.2.0_20240605000001Z.zip'
sh label: 'Delete Snomed CT database zip', script: 'rm ./snomed-database-loader/uk_sct2mo_39.0.0_20240925000001Z.zip'
sh label: 'clean up dangling images', script: 'docker image prune -f'
} // always
} // post
Expand Down
4 changes: 2 additions & 2 deletions OPERATING.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ can be executed against the database using the required environment variables li
Example usage:
```sh
$ docker run --rm -e PS_DB_OWNER_NAME=postgres -e POSTGRES_PASSWORD=super5ecret -e PS_DB_HOST=postgres -e PS_DB_PORT=5432 \
-v /path/to/uk_sct2mo_38.2.0_20240605000001Z.zip:/snomed/uk_sct2mo_38.2.0_20240605000001Z.zip \
nhsdev/nia-ps-snomed-schema /snomed/uk_sct2mo_38.2.0_20240605000001Z.zip
-v /path/to/uk_sct2mo_39.0.0_20240925000001Z.zip:/snomed/uk_sct2mo_39.0.0_20240925000001Z.zip \
nhsdev/nia-ps-snomed-schema /snomed/uk_sct2mo_39.0.0_20240925000001Z.zip
```

#### First installation
Expand Down
2 changes: 1 addition & 1 deletion docker/example.vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ export SDS_BASE_URL="https://int.api.service.nhs.uk/spine-directory/FHIR/R4/"

export SKIP_DECODE="false"
#change path for snomedFile fath
#export SNOMED_CT_TERMINOLOGY_FILE="/mnt/c/Users/yourUserName/yourPath/uk_sct2mo_38.2.0_20240605000001Z.zip";
#export SNOMED_CT_TERMINOLOGY_FILE="/mnt/c/Users/yourUserName/yourPath/uk_sct2mo_39.0.0_20240925000001Z.zip";
2 changes: 1 addition & 1 deletion docker/release-scripts/ps-mhs-e2e/vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#SECRET KEY VARS
#User-specific env variables
export SNOMED_FILE_LOCATION="../uk_sct2mo_38.2.0_20240605000001Z.zip"
export SNOMED_FILE_LOCATION="../uk_sct2mo_39.0.0_20240925000001Z.zip"

export MHS_SECRET_PARTY_KEY="Y90664-9198273"
export MHS_SECRET_CLIENT_CERT="-----BEGIN CERTIFICATE-----
Expand Down
2 changes: 1 addition & 1 deletion docker/start-local-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker-compose up -d ps_db mhs-adaptor-mock activemq;
cd ../db-connector
./gradlew update

##### comment out if there is no uk_sct2mo_38.2.0_20240605000001Z.zip file
##### comment out if there is no uk_sct2mo_*.zip file
cd ../snomed-database-loader
./load_release-postgresql.sh "$SNOMED_CT_TERMINOLOGY_FILE"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2692,7 +2692,7 @@
} ],
"system": "http://snomed.info/sct",
"code": "160274005",
"display": "No family history diabetes"
"display": "No family history of diabetes mellitus"
} ],
"text": "No FH: diabetes"
},
Expand Down
2 changes: 1 addition & 1 deletion snomed-database-loader/load_release-postgresql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ isMonolith=false

if [ -z ${releasePath} ]
then
echo "Please set the path to zipped SnomedCT RF2 release as the first argument, e.g. ./load_release-postgresql.sh uk_sct2mo_38.2.0_20240605000001Z.zip"
echo "Please set the path to zipped SnomedCT RF2 release as the first argument, e.g. ./load_release-postgresql.sh uk_sct2mo_39.0.0_20240925000001Z.zip"
exit -1
fi

Expand Down
2 changes: 1 addition & 1 deletion test-suite/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ If you want to start from a fresh DB, delete the volume with `docker volume rm t
SDS_API_KEY: "change_if_needed" # used for calculating migration timeouts

#changepathforsnomedFilepath
SNOMED_CT_TERMINOLOGY_FILE: "/snomed/file/location/uk_sct2mo_38.2.0_20240605000001Z.zip"
SNOMED_CT_TERMINOLOGY_FILE: "/snomed/file/location/uk_sct2mo_39.0.0_20240925000001Z.zip"

PS_LOGGING_LEVEL: "DEBUG"

Expand Down
2 changes: 1 addition & 1 deletion test-suite/docker/vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# MHS VARS
#SECRET KEY VARS
#User-specific env variables
export SNOMED_FILE_LOCATION="../uk_sct2mo_38.2.0_20240605000001Z.zip"
export SNOMED_FILE_LOCATION="../uk_sct2mo_39.0.0_20240925000001Z.zip"
export MHS_SECRET_PARTY_KEY="Y90664-9198273"
export MHS_SECRET_CLIENT_CERT="-----BEGIN CERTIFICATE-----
MIIFPTCCAyUCFAKYCULeFVcQCwXCGCiCFVu09NmzMA0GCSqGSIb3DQEBCwUAMF0x
Expand Down